zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 21:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use reserved>pw element as disputed password

Browse source
This commit is contained in:
Karl Erik Õunapuu 2020-05-07 16:20:09 +03:00
parent 2525f14a18
commit fabcdf9b7e
2 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/epp/domain.rb
View file

@ -156,7 +156,6 @@ class Epp::Domain < Domain
at[:period_unit] = Epp::Domain.parse_period_unit_from_frame(frame) || 'y' at[:period_unit] = Epp::Domain.parse_period_unit_from_frame(frame) || 'y'
at[:reserved_pw] = frame.css('reserved > pw').text at[:reserved_pw] = frame.css('reserved > pw').text
at[:disputed_pw] = frame.css('disputed > pw').text
# at[:statuses] = domain_statuses_attrs(frame, action) # at[:statuses] = domain_statuses_attrs(frame, action)
at[:nameservers_attributes] = nameservers_attrs(frame, action) at[:nameservers_attributes] = nameservers_attrs(frame, action)
@ -479,15 +478,15 @@ class Epp::Domain < Domain
same_registrant_as_current = (registrant.code == frame.css('registrant').text) same_registrant_as_current = (registrant.code == frame.css('registrant').text)
if !same_registrant_as_current && disputed? if !same_registrant_as_current && disputed?
disputed_pw = frame.css('disputed > pw').text disputed_pw = frame.css('reserved > pw').text
if disputed_pw.blank? if disputed_pw.blank?
add_epp_error('2304', nil, nil, 'Required parameter missing; disputed' \ add_epp_error('2304', nil, nil, 'Required parameter missing; reserved' \
'pw element required for dispute domains') 'pw element required for dispute domains')
else else
dispute = Dispute.active.find_by(domain_name: name, password: disputed_pw) dispute = Dispute.active.find_by(domain_name: name, password: disputed_pw)
if dispute.nil? if dispute.nil?
add_epp_error('2202', nil, nil, 'Invalid authorization information; '\ add_epp_error('2202', nil, nil, 'Invalid authorization information; '\
'invalid disputed>pw value') 'invalid reserved>pw value')
end end
end end
end end

11
lib/schemas/eis-1.0.xsd
View file

@ -25,7 +25,6 @@
<element name="ident" type="eis:identType" minOccurs="0" maxOccurs="1"/> <element name="ident" type="eis:identType" minOccurs="0" maxOccurs="1"/>
<element name="legalDocument" type="eis:legalDocType" minOccurs="0" maxOccurs="1"/> <element name="legalDocument" type="eis:legalDocType" minOccurs="0" maxOccurs="1"/>
<element name="reserved" type="eis:reservedType" minOccurs="0" maxOccurs="1"/> <element name="reserved" type="eis:reservedType" minOccurs="0" maxOccurs="1"/>
<element name="disputed" type="eis:disputedType" minOccurs="0" maxOccurs="1"/>
</sequence> </sequence>
</complexType> </complexType>
@ -50,16 +49,6 @@
</restriction> </restriction>
</simpleType> </simpleType>
<!--
Disputed for providing passwords for disputed domains
-->
<complexType name="disputedType">
<sequence>
<element name="pw" type="eis:pwType" minOccurs="0" maxOccurs="1"/>
</sequence>
</complexType>
<!-- <!--
Legal document, encoded in base64 Legal document, encoded in base64
--> -->