Merge pull request #298 from internetee/registry-251

Registry 251
This commit is contained in:
Timo Võhmar 2016-12-16 13:07:44 +02:00 committed by GitHub
commit 3e3efad475
5 changed files with 15 additions and 13 deletions

View file

@ -1,3 +1,8 @@
16.12.2016
* Allow contact address processing to be configurable via admin
* EPP XML schema namespace "urn:ietf:params:xml:ns:epp-1.0" replaced with "https://epp.tld.ee/schema/epp-ee-1.0.xsd"
* EPP XML schema contact-eis-1.0 replaced with contact-ee-1.1
18.11.2016 18.11.2016
* Domain expiration emails are now sent out to admin contacts as well. Sending bug is fixed. * Domain expiration emails are now sent out to admin contacts as well. Sending bug is fixed.
* Include detailed registrar's contact info in emails * Include detailed registrar's contact info in emails

View file

@ -83,9 +83,8 @@ gem 'deep_cloneable', '2.1.1'
# id + mid login # id + mid login
gem 'digidoc_client', '0.2.1' gem 'digidoc_client', '0.2.1'
# epp gem 'epp', '1.5.0', github: 'internetee/epp'
gem 'epp', '1.4.2', github: 'internetee/epp' gem 'epp-xml', '1.1.0', github: 'internetee/epp-xml'
gem 'epp-xml', '1.0.5', github: 'internetee/epp-xml' # EIS EPP XMLs
gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem) gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem)
# que # que

View file

@ -18,17 +18,17 @@ GIT
GIT GIT
remote: https://github.com/internetee/epp-xml.git remote: https://github.com/internetee/epp-xml.git
revision: 475f650951f2cf5015e00d48f408a2194ecc1662 revision: 5dd542e67ef26d58365f30e553254d6db809277d
specs: specs:
epp-xml (1.0.5) epp-xml (1.1.0)
activesupport (~> 4.1) activesupport (~> 4.1)
builder (~> 3.2) builder (~> 3.2)
GIT GIT
remote: https://github.com/internetee/epp.git remote: https://github.com/internetee/epp.git
revision: 505c3f2739eb1da918e54111aecfb138a822739d revision: 1a50f2144f15a2d975337e56fb1ccaba5d956e9d
specs: specs:
epp (1.4.2) epp (1.5.0)
hpricot hpricot
libxml-ruby libxml-ruby
@ -299,7 +299,7 @@ GEM
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.11) libv8 (3.16.14.11)
libxml-ruby (2.8.0) libxml-ruby (2.9.0)
liquid (3.0.6) liquid (3.0.6)
listen (3.0.3) listen (3.0.3)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
@ -593,8 +593,8 @@ DEPENDENCIES
deep_cloneable (= 2.1.1) deep_cloneable (= 2.1.1)
devise (= 3.5.4) devise (= 3.5.4)
digidoc_client (= 0.2.1) digidoc_client (= 0.2.1)
epp (= 1.4.2)! epp (= 1.5.0)!
epp-xml (= 1.0.5)! epp-xml (= 1.1.0)!
fabrication (= 2.13.2) fabrication (= 2.13.2)
factory_girl_rails factory_girl_rails
figaro (= 1.1.1) figaro (= 1.1.1)

View file

@ -21,8 +21,6 @@ module Repp
attributes = Contact.attribute_names - Contact.address_attribute_names attributes = Contact.attribute_names - Contact.address_attribute_names
contacts = contacts.select(attributes) contacts = contacts.select(attributes)
end end
contacts
else else
contacts = current_user.registrar.contacts.limit(limit).offset(offset).pluck(:code) contacts = current_user.registrar.contacts.limit(limit).offset(offset).pluck(:code)
end end

View file

@ -27,7 +27,7 @@ class Epp::SessionsController < EppController
end end
end end
if !Rails.env.development? && !Rails.env.test? && !webclient_request && @api_user if !webclient_request && @api_user
unless @api_user.api_pki_ok?(request.env['HTTP_SSL_CLIENT_CERT'], request.env['HTTP_SSL_CLIENT_S_DN_CN']) unless @api_user.api_pki_ok?(request.env['HTTP_SSL_CLIENT_CERT'], request.env['HTTP_SSL_CLIENT_S_DN_CN'])
epp_errors << { epp_errors << {
msg: 'Authentication error; server closing connection (certificate is not valid)', msg: 'Authentication error; server closing connection (certificate is not valid)',