diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb index dec6a04a6..e69576d88 100644 --- a/app/controllers/epp/domains_controller.rb +++ b/app/controllers/epp/domains_controller.rb @@ -128,14 +128,9 @@ class Epp::DomainsController < EppController ret = true # TODO: Verify contact presence if registrant is juridical - attrs_present = epp_request_valid?('name', 'ns', 'registrant', 'legalDocument') + attrs_present = epp_request_valid?('name', 'ns', 'registrant', 'legalDocument', 'hostAttr') ret = false unless attrs_present - if params[:parsed_frame].css('hostObj').any? - epp_errors << { code: '2306', msg: I18n.t('host_obj_is_not_allowed') } - ret = false - end - if params[:parsed_frame].css('dsData').count > 0 && params[:parsed_frame].css('create > keyData').count > 0 epp_errors << { code: '2306', msg: I18n.t('ds_data_and_key_data_must_not_exists_together') } ret = false diff --git a/app/models/epp/epp_domain.rb b/app/models/epp/epp_domain.rb index e02760402..b3ade4c2f 100644 --- a/app/models/epp/epp_domain.rb +++ b/app/models/epp/epp_domain.rb @@ -177,7 +177,7 @@ class Epp::EppDomain < Domain ns_list.each do |ns_attrs| nameserver = nameservers.where(ns_attrs) if nameserver.blank? - add_epp_error('2303', 'hostObj', ns_attrs[:hostname], [:nameservers, :not_found]) + add_epp_error('2303', 'hostAttr', ns_attrs[:hostname], [:nameservers, :not_found]) else to_delete << nameserver end @@ -509,12 +509,6 @@ class Epp::EppDomain < Domain res << host_attr.delete_if { |_k, v| v.blank? } end - parsed_frame.css('hostObj').each do |x| - res << { - hostname: x.text - } - end - res end diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb index 65373034d..26acfd39b 100644 --- a/app/models/nameserver.rb +++ b/app/models/nameserver.rb @@ -21,10 +21,10 @@ class Nameserver < ActiveRecord::Base def epp_code_map { '2302' => [ - [:hostname, :taken, { value: { obj: 'hostObj', val: hostname } }] + [:hostname, :taken, { value: { obj: 'hostAttr', val: hostname } }] ], '2005' => [ - [:hostname, :invalid, { value: { obj: 'hostObj', val: hostname } }], + [:hostname, :invalid, { value: { obj: 'hostAttr', val: hostname } }], [:ipv4, :invalid, { value: { obj: 'hostAddr', val: ipv4 } }], [:ipv6, :invalid, { value: { obj: 'hostAddr', val: ipv6 } }] ], diff --git a/doc/epp-examples.md b/doc/epp-examples.md index 50d5b97c4..d8912b450 100644 --- a/doc/epp-examples.md +++ b/doc/epp-examples.md @@ -1,5 +1,5 @@ # EPP REQUEST - RESPONSE EXAMPLES -GENERATED AT: 2015-01-21 12:29:38 +0200 +GENERATED AT: 2015-01-21 13:17:50 +0200 EXAMPLE COUNT: 103 --- @@ -32,7 +32,7 @@ RESPONSE: ABC-12345 - ccReg-4501361376 + ccReg-3345381332 ``` @@ -84,7 +84,7 @@ RESPONSE: ABC-12345 - ccReg-3301397139 + ccReg-5692303292 ``` @@ -128,13 +128,13 @@ RESPONSE: - 0f9e4eed - 2015-01-21 10:29:40 UTC + a9cd35d8 + 2015-01-21 11:17:51 UTC ABC-12345 - ccReg-0551166792 + ccReg-4203196256 @@ -179,13 +179,13 @@ RESPONSE: - 4a2619b7 - 2015-01-21 10:29:41 UTC + d13660b8 + 2015-01-21 11:17:52 UTC ABC-12345 - ccReg-7366701880 + ccReg-4229765408 @@ -230,13 +230,13 @@ RESPONSE: - 88fe61f4 - 2015-01-21 10:29:41 UTC + 81b84065 + 2015-01-21 11:17:52 UTC ABC-12345 - ccReg-9638253560 + ccReg-0635045496 @@ -281,13 +281,13 @@ RESPONSE: - 0b66c137 - 2015-01-21 10:29:42 UTC + edca3ef8 + 2015-01-21 11:17:53 UTC ABC-12345 - ccReg-2602273716 + ccReg-1741690531 @@ -340,13 +340,13 @@ RESPONSE: - b20268f5 - 2015-01-21 10:29:42 UTC + 3594d8b3 + 2015-01-21 11:17:53 UTC ABC-12345 - ccReg-0644641237 + ccReg-9651271403 @@ -395,13 +395,13 @@ RESPONSE: - 304d4fbc - 2015-01-21 10:29:43 UTC + 4b1517ee + 2015-01-21 11:17:54 UTC ABC-12345 - ccReg-9850567700 + ccReg-8650061611 @@ -438,7 +438,7 @@ RESPONSE: ABC-12345 - ccReg-0797369949 + ccReg-0761478715 ``` @@ -487,7 +487,7 @@ RESPONSE: ABC-12345 - ccReg-2298410935 + ccReg-0122260130 ``` @@ -536,12 +536,12 @@ RESPONSE: sh8013 - 2015-01-21 10:29:44 UTC + 2015-01-21 11:17:55 UTC ABC-12345 - ccReg-1023185320 + ccReg-6553420389 @@ -594,7 +594,7 @@ RESPONSE: ABC-12345 - ccReg-5978776625 + ccReg-3988535936 ``` @@ -643,12 +643,12 @@ RESPONSE: sh8013 - 2015-01-21 10:29:45 UTC + 2015-01-21 11:17:56 UTC ABC-12345 - ccReg-2506903052 + ccReg-0206134291 @@ -684,7 +684,7 @@ RESPONSE: ABC-12345 - ccReg-0395463983 + ccReg-0110560689 ``` @@ -718,7 +718,7 @@ RESPONSE: ABC-12345 - ccReg-9330149151 + ccReg-4805175557 @@ -760,7 +760,7 @@ RESPONSE: ABC-12345 - ccReg-8189874530 + ccReg-6118324593 ``` @@ -795,7 +795,7 @@ RESPONSE: ABC-12345 - ccReg-0461015300 + ccReg-6096975468 ``` @@ -830,7 +830,7 @@ RESPONSE: ABC-12345 - ccReg-7483860404 + ccReg-2791396018 ``` @@ -876,7 +876,7 @@ RESPONSE: ABC-12345 - ccReg-5786454908 + ccReg-5610655468 @@ -916,14 +916,14 @@ RESPONSE: Johnny Awesome - Rodriguez Well - Larissatown + Shawn Orchard + West Angus +372.12345678 - gus_wiegand@watersmosciski.info - 2015-01-21 10:29:48 UTC + augustus@nolan.info + 2015-01-21 11:18:00 UTC 37605030299 asde @@ -942,7 +942,7 @@ RESPONSE: ABC-12345 - ccReg-8576213187 + ccReg-8209089897 @@ -981,7 +981,7 @@ RESPONSE: ABC-12345 - ccReg-2753343096 + ccReg-5997051320 ``` @@ -1022,7 +1022,7 @@ RESPONSE: - 2015-01-21 10:29:49 UTC + 2015-01-21 11:18:01 UTC 37605030299 @@ -1038,7 +1038,7 @@ RESPONSE: ABC-12345 - ccReg-5877293456 + ccReg-4723145747 @@ -1078,14 +1078,14 @@ RESPONSE: Johnny Awesome - Rodriguez Well - Larissatown + Shawn Orchard + West Angus +372.12345678 - gus_wiegand@watersmosciski.info - 2015-01-21 10:29:50 UTC + augustus@nolan.info + 2015-01-21 11:18:01 UTC 37605030299 password @@ -1104,7 +1104,7 @@ RESPONSE: ABC-12345 - ccReg-8230707815 + ccReg-0240663083 @@ -1140,7 +1140,7 @@ RESPONSE: ABC-12345 - ccReg-4597529491 + ccReg-0869005898 ``` @@ -1181,7 +1181,7 @@ RESPONSE: ABC-12345 - ccReg-5481429992 + ccReg-1964479372 ``` @@ -1220,14 +1220,14 @@ RESPONSE: Johnny Awesome - Rodriguez Well - Larissatown + Shawn Orchard + West Angus +372.12345678 - gus_wiegand@watersmosciski.info - 2015-01-21 10:29:51 UTC + augustus@nolan.info + 2015-01-21 11:18:03 UTC 37605030299 ccds4324pok @@ -1246,7 +1246,7 @@ RESPONSE: ABC-12345 - ccReg-6958827963 + ccReg-0458798504 @@ -1286,10 +1286,10 @@ RESPONSE: info-4444 - Mr. Arvid Volkman + Nedra Rutherford - 2015-01-21 10:29:51 UTC + 2015-01-21 11:18:03 UTC 37605030299 @@ -1305,7 +1305,7 @@ RESPONSE: ABC-12345 - ccReg-5835939247 + ccReg-3363762846 @@ -1341,7 +1341,7 @@ RESPONSE: ABC-12345 - ccReg-0322703567 + ccReg-0075802011 ``` @@ -1379,7 +1379,7 @@ RESPONSE: ABC-12345 - ccReg-8290951401 + ccReg-0580438213 ``` @@ -1417,7 +1417,7 @@ RESPONSE: ABC-12345 - ccReg-6765703671 + ccReg-3236738342 ``` @@ -1489,7 +1489,7 @@ RESPONSE: ABC-12345 - ccReg-6614677095 + ccReg-7176328765 ``` @@ -1527,10 +1527,13 @@ RESPONSE: Required parameter missing: legalDocument + + Required parameter missing: hostAttr + ABC-12345 - ccReg-2829503581 + ccReg-3785368961 ``` @@ -1571,7 +1574,7 @@ RESPONSE: ABC-12345 - ccReg-0885246830 + ccReg-0920441510 @@ -1612,7 +1615,7 @@ RESPONSE: ABC-12345 - ccReg-3321852611 + ccReg-9648173256 @@ -1662,7 +1665,7 @@ RESPONSE: ABC-12345 - ccReg-2685425461 + ccReg-9815279137 @@ -1709,7 +1712,7 @@ RESPONSE: ABC-12345 - ccReg-3850735872 + ccReg-5190800337 @@ -1751,7 +1754,7 @@ RESPONSE: ABC-12345 - ccReg-0097877977 + ccReg-1611855270 ``` @@ -1768,7 +1771,7 @@ REQUEST: example.ee - 387f50217dfd0f5775cead6f1eccdedb + 07ee162f36e06d64eb1318d94a930af6 @@ -1791,16 +1794,16 @@ RESPONSE: example.ee serverApproved 123 - 2015-01-21 10:29:57 UTC + 2015-01-21 11:18:08 UTC 12345678 - 2015-01-21 10:29:57 UTC + 2015-01-21 11:18:08 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-9830958341 + ccReg-1972989306 ``` @@ -1815,7 +1818,7 @@ REQUEST: example.ee - 38518219ab5a5b2cebfd4748bf3eda6f + 78d7a8a76657037bf4e186b837217ea2 @@ -1838,16 +1841,16 @@ RESPONSE: example.ee pending 12345678 - 2015-01-21 10:29:57 UTC + 2015-01-21 11:18:08 UTC 123 - 2015-01-21 11:29:57 UTC + 2015-01-21 12:18:08 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-2765396230 + ccReg-8261236190 ``` @@ -1862,7 +1865,7 @@ REQUEST: example.ee - 38518219ab5a5b2cebfd4748bf3eda6f + 78d7a8a76657037bf4e186b837217ea2 @@ -1885,16 +1888,16 @@ RESPONSE: example.ee pending 12345678 - 2015-01-21 10:29:57 UTC + 2015-01-21 11:18:08 UTC 123 - 2015-01-21 11:29:57 UTC + 2015-01-21 12:18:08 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-1349071112 + ccReg-9660328046 ``` @@ -1921,7 +1924,7 @@ RESPONSE: Command completed successfully; ack to dequeue - 2015-01-21 10:29:57 UTC + 2015-01-21 11:18:08 UTC Transfer requested. @@ -1929,15 +1932,15 @@ RESPONSE: example.ee pending 12345678 - 2015-01-21 10:29:57 UTC + 2015-01-21 11:18:08 UTC 123 - 2015-01-21 11:29:57 UTC + 2015-01-21 12:18:08 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-3758969507 + ccReg-6605952125 @@ -1967,7 +1970,7 @@ RESPONSE: ABC-12345 - ccReg-3104454880 + ccReg-8966070828 @@ -1985,7 +1988,7 @@ REQUEST: example.ee - 5c1ff5b0e90966530f37c7f8c411fd9d + c390463d4aeeebdb0498fe6c4fd8d6b3 @@ -2006,7 +2009,7 @@ RESPONSE: ABC-12345 - ccReg-0201363674 + ccReg-6798146630 ``` @@ -2023,7 +2026,7 @@ REQUEST: example.ee - 383c1c1c3353d81ce96b693aa14ffd16 + ad783e3e905b53dc5fba15d6e7dd48bd @@ -2046,16 +2049,16 @@ RESPONSE: example.ee clientApproved 123 - 2015-01-21 10:29:59 UTC + 2015-01-21 11:18:09 UTC 12345678 - 2015-01-21 10:29:59 UTC + 2015-01-21 11:18:09 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-6235387040 + ccReg-1154599031 ``` @@ -2093,7 +2096,7 @@ RESPONSE: ABC-12345 - ccReg-1754073529 + ccReg-8669319346 ``` @@ -2110,7 +2113,7 @@ REQUEST: example.ee - d3a56768abdaedc545b8df3fdcd90645 + b03d68aa48557d0b8509de043525ddd0 @@ -2131,7 +2134,7 @@ RESPONSE: ABC-12345 - ccReg-9735284102 + ccReg-7757062263 ``` @@ -2169,7 +2172,7 @@ RESPONSE: ABC-12345 - ccReg-2657494395 + ccReg-5250233313 ``` @@ -2207,7 +2210,7 @@ RESPONSE: ABC-12345 - ccReg-1053801473 + ccReg-7247414425 ``` @@ -2243,7 +2246,7 @@ RESPONSE: ABC-12345 - ccReg-6288024950 + ccReg-6224405701 ``` @@ -2260,7 +2263,7 @@ REQUEST: example.ee - c570157229fd5a1bd7a7e9bf31ba4db2 + 00d1358a6284010b70f98c56dce8e051 @@ -2288,16 +2291,16 @@ RESPONSE: example.ee serverApproved 123 - 2015-01-21 10:30:02 UTC + 2015-01-21 11:18:13 UTC 12345678 - 2015-01-21 10:30:02 UTC + 2015-01-21 11:18:13 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-6313594099 + ccReg-2689125610 ``` @@ -2314,7 +2317,7 @@ REQUEST: example.ee - 47d61710660e41336d52bf8e1131080a + 97ccc5c82c1deaac94a81a08ab3d0816 @@ -2342,16 +2345,16 @@ RESPONSE: example.ee pending 123 - 2015-01-21 10:30:02 UTC + 2015-01-21 11:18:13 UTC 12345678 - 2015-01-21 11:30:02 UTC + 2015-01-21 12:18:13 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-4475565441 + ccReg-9936184798 ``` @@ -2366,7 +2369,7 @@ REQUEST: example.ee - 47d61710660e41336d52bf8e1131080a + 97ccc5c82c1deaac94a81a08ab3d0816 @@ -2394,16 +2397,16 @@ RESPONSE: example.ee pending 123 - 2015-01-21 10:30:02 UTC + 2015-01-21 11:18:13 UTC 12345678 - 2015-01-21 11:30:02 UTC + 2015-01-21 12:18:13 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-8380815020 + ccReg-7756615484 ``` @@ -2420,7 +2423,7 @@ REQUEST: example.ee - 70998e3012697937f21f0c0f22f346a6 + 0152236d4f73289c5db673198dc91ab2 @@ -2446,7 +2449,7 @@ RESPONSE: ABC-12345 - ccReg-7498348115 + ccReg-5887368603 ``` @@ -2461,7 +2464,7 @@ REQUEST: example.ee - 70998e3012697937f21f0c0f22f346a6 + 0152236d4f73289c5db673198dc91ab2 @@ -2489,7 +2492,7 @@ RESPONSE: example.ee clientRejected 123 - 2015-01-21 10:30:03 UTC + 2015-01-21 11:18:14 UTC 12345678 2016-01-21 00:00:00 UTC @@ -2498,7 +2501,7 @@ RESPONSE: ABC-12345 - ccReg-1063713828 + ccReg-3964353012 ``` @@ -2561,14 +2564,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:04 UTC + 2015-01-21 11:18:15 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-5215639689 + ccReg-5159234248 ``` @@ -2623,14 +2626,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:04 UTC + 2015-01-21 11:18:15 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-6832738923 + ccReg-6123448791 ``` @@ -2693,14 +2696,14 @@ RESPONSE: ria.ee - 2015-01-21 10:30:05 UTC + 2015-01-21 11:18:16 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-6312166836 + ccReg-3914545993 ``` @@ -2761,7 +2764,7 @@ RESPONSE: ABC-12345 - ccReg-6137419157 + ccReg-2101400828 ``` @@ -2824,14 +2827,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:06 UTC + 2015-01-21 11:18:17 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-3537224792 + ccReg-5021825039 ``` @@ -2895,7 +2898,7 @@ RESPONSE: ABC-12345 - ccReg-9671674515 + ccReg-1003104793 ``` @@ -2961,7 +2964,7 @@ RESPONSE: ABC-12345 - ccReg-7466996313 + ccReg-9215902930 ``` @@ -3024,7 +3027,7 @@ RESPONSE: ABC-12345 - ccReg-5216540480 + ccReg-0817529424 ``` @@ -3075,10 +3078,13 @@ RESPONSE: Required parameter missing: ns + + Required parameter missing: hostAttr + ABC-12345 - ccReg-5311304733 + ccReg-3309489078 ``` @@ -3175,7 +3181,7 @@ RESPONSE: ABC-12345 - ccReg-2795456597 + ccReg-0238483214 ``` @@ -3233,24 +3239,24 @@ RESPONSE: Hostname is invalid - invalid1- + invalid1- Hostname is invalid - -invalid2 + -invalid2 ABC-12345 - ccReg-4112378812 + ccReg-2760060286 ``` -### EPP Domain with valid user with citizen as an owner does not allow hostObj +### EPP Domain with valid user with citizen as an owner checks hostAttr presence REQUEST: @@ -3296,13 +3302,13 @@ RESPONSE: - - hostObj object is not allowed + + Required parameter missing: hostAttr ABC-12345 - ccReg-2662724544 + ccReg-8339357764 ``` @@ -3360,14 +3366,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:10 UTC + 2015-01-21 11:18:20 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-1461224129 + ccReg-9197190538 ``` @@ -3434,7 +3440,7 @@ RESPONSE: ABC-12345 - ccReg-5799179566 + ccReg-1314119436 ``` @@ -3497,14 +3503,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:11 UTC + 2015-01-21 11:18:21 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-3488238698 + ccReg-5757037001 ``` @@ -3570,7 +3576,7 @@ RESPONSE: ABC-12345 - ccReg-9637388295 + ccReg-6252531442 ``` @@ -3645,14 +3651,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:12 UTC + 2015-01-21 11:18:22 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-7621148189 + ccReg-9776302964 ``` @@ -3763,7 +3769,7 @@ RESPONSE: ABC-12345 - ccReg-0230100097 + ccReg-8884445116 ``` @@ -3835,7 +3841,7 @@ RESPONSE: ABC-12345 - ccReg-5657943049 + ccReg-7711099078 ``` @@ -3904,7 +3910,7 @@ RESPONSE: ABC-12345 - ccReg-6011706696 + ccReg-3210013937 ``` @@ -3967,14 +3973,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:14 UTC + 2015-01-21 11:18:23 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-3236204101 + ccReg-4456271012 ``` @@ -4043,14 +4049,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:15 UTC + 2015-01-21 11:18:24 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-4988862110 + ccReg-6805784854 ``` @@ -4119,7 +4125,7 @@ RESPONSE: ABC-12345 - ccReg-3974220517 + ccReg-5374392455 ``` @@ -4188,7 +4194,7 @@ RESPONSE: ABC-12345 - ccReg-8365042433 + ccReg-3242910020 ``` @@ -4251,7 +4257,7 @@ RESPONSE: ABC-12345 - ccReg-8809596505 + ccReg-9028581463 ``` @@ -4312,14 +4318,14 @@ RESPONSE: example.ee - 2015-01-21 10:30:17 UTC + 2015-01-21 11:18:26 UTC 2016-01-21 00:00:00 UTC ABC-12345 - ccReg-6634178121 + ccReg-4531517815 ``` @@ -4380,7 +4386,7 @@ RESPONSE: ABC-12345 - ccReg-6052411567 + ccReg-8684142907 ``` @@ -4422,7 +4428,7 @@ RESPONSE: ABC-12345 - ccReg-7445464452 + ccReg-3467286551 @@ -4463,7 +4469,7 @@ RESPONSE: ABC-12345 - ccReg-2600212757 + ccReg-2151973115 ``` @@ -4503,7 +4509,7 @@ RESPONSE: ABC-12345 - ccReg-1319516698 + ccReg-2085081848 ``` @@ -4542,36 +4548,36 @@ RESPONSE: example.ee - sh9456 - sh9456 - sh9528 + sh1037 + sh1037 + sh0733 - ns.toy48.ee + ns.fahey48.ee 192.168.1.1 - ns.walsh49.ee + ns.wyman49.ee 192.168.1.1 - ns.hoppezulauf50.ee + ns.stanton50.ee 192.168.1.1 Registrar OÜ Registrar OÜ - 2015-01-21 10:30:19 UTC + 2015-01-21 11:18:29 UTC 2016-01-21 00:00:00 UTC - 1f9c469d2b29fe11efcf4ff01f5d9bb2 + 91f823214f3bf765d73a6376a9acb89d ABC-12345 - ccReg-0380108725 + ccReg-4032174556 ``` @@ -4610,20 +4616,20 @@ RESPONSE: example.ee Payment overdue. - sh0108 - sh0108 - sh9929 + sh3407 + sh3407 + sh1167 - ns.kassulkedickens51.ee + ns.bernhard51.ee 192.168.1.1 - ns.hansen52.ee + ns.erdman52.ee 192.168.1.1 - ns.durgan53.ee + ns.mcclure53.ee 192.168.1.1 @@ -4634,10 +4640,10 @@ RESPONSE: Registrar OÜ Registrar OÜ - 2015-01-21 10:30:20 UTC + 2015-01-21 11:18:29 UTC 2016-01-21 00:00:00 UTC - 08d150715c1bb62c7970714f43949042 + 5dda43aac54d5f0a79e75ed4a319ac45 @@ -4672,7 +4678,7 @@ RESPONSE: ABC-12345 - ccReg-5405753681 + ccReg-1795135160 ``` @@ -4709,20 +4715,20 @@ RESPONSE: example.ee Payment overdue. - sh0108 - sh0108 - sh9929 + sh3407 + sh3407 + sh1167 - ns.kassulkedickens51.ee + ns.bernhard51.ee 192.168.1.1 - ns.hansen52.ee + ns.erdman52.ee 192.168.1.1 - ns.durgan53.ee + ns.mcclure53.ee 192.168.1.1 @@ -4733,11 +4739,11 @@ RESPONSE: Registrar OÜ Registrar OÜ - 2015-01-21 10:30:20 UTC + 2015-01-21 11:18:29 UTC 2016-01-21 00:00:00 UTC - 2015-01-21 10:30:20 UTC + 2015-01-21 11:18:29 UTC - 08d150715c1bb62c7970714f43949042 + 5dda43aac54d5f0a79e75ed4a319ac45 @@ -4772,7 +4778,7 @@ RESPONSE: ABC-12345 - ccReg-9379526485 + ccReg-5200218858 ``` @@ -4813,7 +4819,7 @@ RESPONSE: ABC-12345 - ccReg-0060008399 + ccReg-5718658824 ``` @@ -4831,8 +4837,12 @@ REQUEST: example.ee - ns1.example.com - ns2.example.com + + ns1.example.com + + + ns2.example.com + mak21 Payment overdue. @@ -4878,7 +4888,7 @@ RESPONSE: ABC-12345 - ccReg-3155641703 + ccReg-6230353093 ``` @@ -4894,8 +4904,12 @@ REQUEST: example.ee - ns1.example.com - ns2.example.com + + ns1.example.com + + + ns2.example.com + mak21 Payment overdue. @@ -4938,7 +4952,7 @@ RESPONSE: ABC-12345 - ccReg-6366669084 + ccReg-2910830208 ``` @@ -4954,8 +4968,12 @@ REQUEST: example.ee - ns1.example.com - ns2.example.com + + ns1.example.com + + + ns2.example.com + mak21 Payment overdue. @@ -4995,13 +5013,13 @@ RESPONSE: Nameserver already exists on this domain - ns1.example.com + ns1.example.com Nameserver already exists on this domain - ns2.example.com + ns2.example.com @@ -5037,7 +5055,7 @@ RESPONSE: ABC-12345 - ccReg-9869463114 + ccReg-1781482409 ``` @@ -5055,8 +5073,12 @@ REQUEST: example.ee - ns1.example.com - ns2.example.com + + ns1.example.com + + + ns2.example.com + mak21 Payment overdue. @@ -5099,7 +5121,7 @@ RESPONSE: ABC-12345 - ccReg-6327616059 + ccReg-3132173618 ``` @@ -5115,7 +5137,9 @@ REQUEST: example.ee - ns1.example.com + + ns1.example.com + mak21 @@ -5148,7 +5172,7 @@ RESPONSE: ABC-12345 - ccReg-7934790338 + ccReg-8422466505 ``` @@ -5164,7 +5188,9 @@ REQUEST: example.ee - ns1.example.com + + ns1.example.com + mak21 @@ -5200,7 +5226,7 @@ RESPONSE: Nameserver was not found - ns1.example.com + ns1.example.com @@ -5212,7 +5238,7 @@ RESPONSE: ABC-12345 - ccReg-0231483814 + ccReg-8752845514 ``` @@ -5253,7 +5279,7 @@ RESPONSE: ABC-12345 - ccReg-3935468334 + ccReg-2487109666 ``` @@ -5271,7 +5297,9 @@ REQUEST: example.ee - ns1.example.com + + ns1.example.com + @@ -5293,7 +5321,7 @@ RESPONSE: ABC-12345 - ccReg-4958951872 + ccReg-0939802745 ``` @@ -5309,7 +5337,9 @@ REQUEST: example.ee - ns1.example.com + + ns1.example.com + @@ -5328,13 +5358,13 @@ RESPONSE: Nameserver already exists on this domain - ns1.example.com + ns1.example.com ABC-12345 - ccReg-1011626231 + ccReg-3966241481 ``` @@ -5372,7 +5402,7 @@ RESPONSE: ABC-12345 - ccReg-9743302727 + ccReg-5621381090 ``` @@ -5416,7 +5446,7 @@ RESPONSE: ABC-12345 - ccReg-4151408787 + ccReg-0957399287 ``` @@ -5457,7 +5487,7 @@ RESPONSE: ABC-12345 - ccReg-4576752535 + ccReg-7157685584 ``` @@ -5497,7 +5527,7 @@ RESPONSE: ABC-12345 - ccReg-3919038536 + ccReg-3375868395 ``` @@ -5537,7 +5567,7 @@ RESPONSE: ABC-12345 - ccReg-4602022297 + ccReg-1930571172 ``` @@ -5572,7 +5602,7 @@ RESPONSE: ABC-12345 - ccReg-7492617073 + ccReg-2898377620 ``` @@ -5596,13 +5626,13 @@ REQUEST: cmlraXN0aGViZXN0 - 7aca517daf5b52b59037a56ab3238056 + 08fcc973f912fc580efc0ad7d757f11a P1M13D - 1421836228 + 1421839117 ``` @@ -5618,8 +5648,8 @@ RESPONSE: - 1421836228 - ccReg-7856423141 + 1421839117 + ccReg-3817821873 ``` @@ -5641,13 +5671,13 @@ REQUEST: cmlraXN0aGViZXN0 - 8890cf7fdaa40de573f3c0997482bc52 + a05969d04c59056072458cbeb44ba7d4 Invalid Expiry - 1421836228 + 1421839118 ``` @@ -5663,8 +5693,8 @@ RESPONSE: - 1421836228 - ccReg-9893241800 + 1421839118 + ccReg-5276871385 ``` @@ -5686,13 +5716,13 @@ REQUEST: cmlraXN0aGViZXN0 - 46699c06a52c5e273373d8272f3f06c3 + 8c4382d5aba4c7be42f13135117baa4d Invalid Expiry - 1421836229 + 1421839118 ``` @@ -5711,8 +5741,8 @@ RESPONSE: - 1421836229 - ccReg-3255734550 + 1421839118 + ccReg-2378152907 ``` @@ -5734,14 +5764,14 @@ REQUEST: cmlraXN0aGViZXN0 - 13190eab5d6e8d1cf4a12aff982d3cc1 + 9fcaf8c4c6c9b76d64acc07b2cad5f13 P1D 2014-12-23 - 1421836230 + 1421839119 ``` @@ -5757,8 +5787,8 @@ RESPONSE: - 1421836230 - ccReg-4132958619 + 1421839119 + ccReg-3695237918 ``` @@ -5772,7 +5802,7 @@ REQUEST: - 1421836230 + 1421839119 ``` @@ -5787,8 +5817,8 @@ RESPONSE: Command completed successfully; no messages - 1421836230 - ccReg-5358036383 + 1421839119 + ccReg-2244030802 @@ -5803,7 +5833,7 @@ REQUEST: - 1421836230 + 1421839119 ``` @@ -5818,8 +5848,8 @@ RESPONSE: Command completed successfully; no messages - 1421836230 - ccReg-6157589123 + 1421839119 + ccReg-5389925583 @@ -5832,7 +5862,7 @@ REQUEST: - 1421836231 + 1421839120 ``` @@ -5847,12 +5877,12 @@ RESPONSE: Command completed successfully; ack to dequeue - 2015-01-21 10:30:30 UTC + 2015-01-21 11:18:39 UTC Balance low. - 1421836231 - ccReg-5225682272 + 1421839120 + ccReg-1377474054 @@ -5865,7 +5895,7 @@ REQUEST: - 1421836231 + 1421839120 ``` @@ -5884,8 +5914,8 @@ RESPONSE: - 1421836231 - ccReg-8230579619 + 1421839120 + ccReg-1838029291 ``` @@ -5897,7 +5927,7 @@ REQUEST: - 1421836231 + 1421839120 ``` @@ -5913,8 +5943,8 @@ RESPONSE: - 1421836231 - ccReg-2476512517 + 1421839120 + ccReg-0947219511 @@ -5927,7 +5957,7 @@ REQUEST: - 1421836231 + 1421839120 ``` @@ -5946,8 +5976,8 @@ RESPONSE: - 1421836231 - ccReg-8821752012 + 1421839120 + ccReg-4300213732 ``` @@ -5961,7 +5991,7 @@ REQUEST: - 1421836231 + 1421839120 ``` @@ -5977,8 +6007,8 @@ RESPONSE: - 1421836231 - ccReg-4427626533 + 1421839120 + ccReg-7727781268 ``` @@ -5992,7 +6022,7 @@ REQUEST: - 1421836232 + 1421839121 ``` @@ -6007,12 +6037,12 @@ RESPONSE: Command completed successfully; ack to dequeue - 2015-01-21 10:30:32 UTC + 2015-01-21 11:18:41 UTC Smth else. - 1421836232 - ccReg-6932166712 + 1421839121 + ccReg-7452001774 @@ -6025,7 +6055,7 @@ REQUEST: - 1421836232 + 1421839121 ``` @@ -6041,8 +6071,8 @@ RESPONSE: - 1421836232 - ccReg-9666400030 + 1421839121 + ccReg-9148325322 @@ -6055,7 +6085,7 @@ REQUEST: - 1421836232 + 1421839121 ``` @@ -6070,12 +6100,12 @@ RESPONSE: Command completed successfully; ack to dequeue - 2015-01-21 10:30:32 UTC + 2015-01-21 11:18:41 UTC Something. - 1421836232 - ccReg-2376562097 + 1421839121 + ccReg-5184218282 @@ -6088,7 +6118,7 @@ REQUEST: - 1421836232 + 1421839121 ``` @@ -6104,8 +6134,8 @@ RESPONSE: - 1421836232 - ccReg-7755816407 + 1421839121 + ccReg-0650033213 @@ -6118,7 +6148,7 @@ REQUEST: - 1421836232 + 1421839121 ``` @@ -6133,12 +6163,12 @@ RESPONSE: Command completed successfully; ack to dequeue - 2015-01-21 10:30:32 UTC + 2015-01-21 11:18:41 UTC Balance low. - 1421836232 - ccReg-3013313986 + 1421839121 + ccReg-1666798938 @@ -6151,7 +6181,7 @@ REQUEST: - 1421836232 + 1421839121 ``` @@ -6167,8 +6197,8 @@ RESPONSE: - 1421836232 - ccReg-0651604210 + 1421839121 + ccReg-9014760285 @@ -6181,7 +6211,7 @@ REQUEST: - 1421836232 + 1421839121 ``` @@ -6196,8 +6226,8 @@ RESPONSE: Command completed successfully; no messages - 1421836232 - ccReg-9205005995 + 1421839121 + ccReg-8632714326 @@ -6212,7 +6242,7 @@ RESPONSE: EPP server (EIS) - 2015-01-21T10:30:33Z + 2015-01-21T11:18:41Z 1.0 en @@ -6289,7 +6319,7 @@ RESPONSE: ABC-12345 - ccReg-8091571303 + ccReg-7958800230 ``` @@ -6335,7 +6365,7 @@ RESPONSE: ABC-12345 - ccReg-7127564335 + ccReg-3810185254 ``` @@ -6368,7 +6398,7 @@ RESPONSE: ABC-12345 - ccReg-0708017445 + ccReg-6686186284 ``` @@ -6415,7 +6445,7 @@ RESPONSE: ABC-12345 - ccReg-8862134897 + ccReg-2800387150 @@ -6463,7 +6493,7 @@ RESPONSE: ABC-12345 - ccReg-1704064402 + ccReg-1058819049 @@ -6493,7 +6523,7 @@ RESPONSE: ABC-12345 - ccReg-6220365602 + ccReg-3005897992 ``` @@ -6540,7 +6570,7 @@ RESPONSE: ABC-12345 - ccReg-7496958864 + ccReg-6718627540 @@ -6587,7 +6617,7 @@ RESPONSE: ABC-12345 - ccReg-4967730499 + ccReg-9129626986 ``` diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb index 99409eb49..5af983f5f 100644 --- a/spec/epp/domain_spec.rb +++ b/spec/epp/domain_spec.rb @@ -506,7 +506,7 @@ describe 'EPP Domain', epp: true do expect(response[:msg]).to eq('Hostname is invalid') end - it 'does not allow hostObj' do + it 'checks hostAttr presence' do xml = domain_create_xml({ ns: [ { @@ -519,8 +519,8 @@ describe 'EPP Domain', epp: true do }) response = epp_request(xml, :xml) - expect(response[:result_code]).to eq('2306') - expect(response[:msg]).to eq('hostObj object is not allowed') + expect(response[:result_code]).to eq('2003') + expect(response[:msg]).to eq('Required parameter missing: hostAttr') end it 'creates domain with nameservers with ips' do @@ -1041,8 +1041,16 @@ describe 'EPP Domain', epp: true do add: [ { ns: [ - { hostObj: { value: 'ns1.example.com' } }, - { hostObj: { value: 'ns2.example.com' } } + { + hostAttr: [ + { hostName: { value: 'ns1.example.com' } } + ] + }, + { + hostAttr: [ + { hostName: { value: 'ns2.example.com' } } + ] + } ] }, _anonymus: [ @@ -1131,8 +1139,16 @@ describe 'EPP Domain', epp: true do add: [ { ns: [ - { hostObj: { value: 'ns1.example.com' } }, - { hostObj: { value: 'ns2.example.com' } } + { + hostAttr: [ + { hostName: { value: 'ns1.example.com' } } + ] + }, + { + hostAttr: [ + { hostName: { value: 'ns2.example.com' } } + ] + } ] }, _anonymus: [ @@ -1169,7 +1185,11 @@ describe 'EPP Domain', epp: true do rem: [ { ns: [ - { hostObj: { value: 'ns1.example.com' } } + { + hostAttr: [ + { hostName: { value: 'ns1.example.com' } } + ] + } ] }, _anonymus: [ @@ -1238,7 +1258,11 @@ describe 'EPP Domain', epp: true do xml = domain_update_xml({ add: [ ns: [ - { hostObj: { value: 'ns1.example.com' } } + { + hostAttr: [ + { hostName: { value: 'ns1.example.com' } } + ] + } ] ] })