diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile index b7d5a67..5542b35 100644 --- a/ACTK1_0/Makefile +++ b/ACTK1_0/Makefile @@ -117,18 +117,18 @@ $(BUILD_OBJ_DIR)/%: $(BUILD_OBJ_DIR)/%.o # ARTKOBJS=build/XMLGregorianCalendar.o build/XMLParser.o build/XMLWriter.o build/ACSession.o build/DomainAddRem.o \ build/EnumDomainInfoResponse.o build/log.o build/PostalInfoType.o build/SessionManagerPropertiesImpl.o \ -build/RegistrantObjectType.o build/LPExtension.o build/LPChkCmdExtension.o build/LPCrtCmdExtension.o \ +build/RegistrantObjectType.o build/LPExtension.o build/LPChkCmdExtension.o build/LPCrtCmdExtension.o build/LPCrtRespExtension.o\ build/AddRemType.o build/DomainCheckResponse.o build/EnumDomainUpdateCommand.o build/Properties.o build/SessionPoolImpl.o \ build/boolean.o build/DomainCreateCommand.o build/EnumType.o build/ProtocolExtensionCommand.o build/SSLException.o \ build/CertificateUserMismatchException.o build/DomainCreateResponse.o build/EPPDateFormatter.o build/ReceiveSE.o build/StandardCommandType.o \ -build/CheckResponse.o build/DomainInfoKVResponseExtension.o build/EPPWriter.o build/NamespaceResolver.o build/StandardObjectType.o \ -build/CLTRID.o build/DomainInfoResponse.o build/ErrorPkg.o build/NAPTR.o build/RegistrantTransferCommandType.o build/StringUtils.o \ -build/CommandCounter.o build/DomainKVCommandExtension.o build/Greeting.o build/NotificationResponse.o build/ResponseExtension.o build/SyncExtension.o \ -build/Command.o build/DomainNotificationResponse.o build/HostAddRem.o build/ObjectCommand.o build/Response.o build/SystemProperties.o \ +build/CheckResponse.o build/DomainInfoKVResponseExtension.o build/EPPWriter.o build/NamespaceResolver.o build/StandardObjectType.o \ +build/CLTRID.o build/DomainInfoResponse.o build/ErrorPkg.o build/NAPTR.o build/RegistrantTransferCommandType.o build/StringUtils.o \ +build/CommandCounter.o build/DomainKVCommandExtension.o build/Greeting.o build/NotificationResponse.o build/ResponseExtension.o build/SyncExtension.o \ +build/Command.o build/DomainNotificationResponse.o build/HostAddRem.o build/ObjectCommand.o build/Response.o build/SystemProperties.o \ build/config.o build/DomainRegistrantTransferCommand.o build/HostCheckResponse.o build/ResultCounter.o build/Timer.o \ build/Constants.o build/DomainRegistrantTransferResponse.o build/HostCreateCommand.o build/Result.o build/TLSContext.o \ -build/ContactCheckResponse.o build/DomainRenewCommand.o build/HostCreateResponse.o build/SecDNSChgType.o build/TLSSession.o \ -build/ContactCreateCommand.o build/DomainRenewResponse.o build/HostInfoResponse.o build/SecDNSDSData.o build/TLSSocket.o \ +build/ContactCheckResponse.o build/DomainRenewCommand.o build/HostCreateResponse.o build/LPChkRespExtension.o build/SecDNSChgType.o build/TLSSession.o \ +build/ContactCreateCommand.o build/DomainRenewResponse.o build/HostInfoResponse.o build/Drafttanepplaunchphase.o build/SecDNSDSData.o build/TLSSocket.o \ build/ContactCreateResponse.o build/DomainSecDNSCreateCommandExtension.o build/HostUpdateCommand.o build/SecDNSDSOrKeyType.o build/TransferCommand.o \ build/ContactInfoResponse.o build/DomainSecDNSInfoResponseExtension.o build/InetAddress.o build/SecDNSExtension.o build/TransferOp.o \ build/ContactNotificationResponse.o build/DomainSecDNSUpdateCommandExtension.o build/InfoResponse.o build/SecDNSKeyData.o build/TransferResponse.o \ diff --git a/ACTK1_0/lib/libACTK1_0.so b/ACTK1_0/lib/libACTK1_0.so deleted file mode 100755 index 21fde93..0000000 Binary files a/ACTK1_0/lib/libACTK1_0.so and /dev/null differ diff --git a/ACTK1_0/se/DomainInfoKVResponseExtension.hpp b/ACTK1_0/se/DomainInfoKVResponseExtension.hpp index fce4653..e773f47 100644 --- a/ACTK1_0/se/DomainInfoKVResponseExtension.hpp +++ b/ACTK1_0/se/DomainInfoKVResponseExtension.hpp @@ -12,7 +12,7 @@ class XMLDocument; /** * Extension of the domain mapping of the EPP info response, as defined in * RFC4930 and RFC4931, to generic domain names, the specification of which is - * in the XML schema definition urn:X-ar:params:xml:ns:kv-1.0. Instances of this + * in the XML schema definition urn:X-ac:params:xml:ns:kv-1.0. Instances of this * class provide an interface to access all of the information available through * EPP for a generic domain name. This relies on the instance first being * initialised by a suitable EPP domain info response using the method diff --git a/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp b/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp index 3928749..92aab86 100644 --- a/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp +++ b/ACTK1_0/se/DomainInfoKVResponseExtensionTest.cpp @@ -18,7 +18,7 @@ void testNonExistentListName() response.registerExtension(&kvExtension); const std::string xml = - "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; + "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; auto_ptr parser(new XMLParser); auto_ptr doc(parser->parse(xml)); @@ -36,7 +36,7 @@ void testNonExistentItem() response.registerExtension(&kvExtension); const std::string xml = - "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; + "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; auto_ptr parser(new XMLParser); auto_ptr doc(parser->parse(xml)); @@ -71,7 +71,7 @@ void testSingleKVList() response.registerExtension(&kvExtension); const std::string xml = - "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; + "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; auto_ptr parser(new XMLParser); auto_ptr doc(parser->parse(xml)); @@ -88,7 +88,7 @@ void testMultipleKVList() response.registerExtension(&kvExtension); const std::string xml = - "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212RegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; + "Command completed successfullyexample.com.aeD0000003-AREXAMPLEEXAMPLEns1.example.com.aens2.example.com.aens1.example.com.aens2.exmaple.com.aeRegistrarRegistrar2006-02-09T15:44:58.0Z2008-02-10T00:00:00.0Z0192pqowRegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212RegistrantName Pty. Ltd.Trade License123456789TrademarkRegistrant EligiTrademark9876543212ABC-12345805"; auto_ptr parser(new XMLParser); auto_ptr doc(parser->parse(xml)); diff --git a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp index 52da157..db9fcb3 100644 --- a/ACTK1_0/se/DomainKVCommandExtensionTest.cpp +++ b/ACTK1_0/se/DomainKVCommandExtensionTest.cpp @@ -30,7 +30,7 @@ void testUpdateSingleKVList() const string xml = updateCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.aeTrademark1AusRegistryACTKUTST.20140101.010101.0" + "ACTKUTST.com.aeTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } @@ -49,7 +49,7 @@ void testCreateSingleKVList() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryACTKUTST.20140101.010101.0" + "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } @@ -69,7 +69,7 @@ void testMultipleKVList() const string xml = createCommand.toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryTrademark1AusRegistryACTKUTST.20140101.010101.0" + "ACTKUTST.com.aeJTKCONjtkUT3stTrademark1AusRegistryTrademark1AusRegistryACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp index 16f838b..c8e46db 100644 --- a/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp +++ b/ACTK1_0/se/DomainRegistrantTransferCommandTest.cpp @@ -31,9 +31,9 @@ void testWithoutPeriod() const std::string xml = command->toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.ae" + "ACTKUTST.com.ae" + EPPDateFormatter::toXSDate(*curExpDate) - + "Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" + + "Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" ); } @@ -46,9 +46,9 @@ void testWithPeriod() const std::string xml = command->toXML(); ASSERT_EQ(xml, - "ACTKUTST.com.ae" + "ACTKUTST.com.ae" + EPPDateFormatter::toXSDate(*curExpDate) - + "2Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" + + "2Trademark1231239523BlahTrademark1Trade License01241326211AusRegistrytestingACTKUTST.20140101.010101.0" ); } diff --git a/ACTK1_0/se/DomainRegistrantTransferResponse.hpp b/ACTK1_0/se/DomainRegistrantTransferResponse.hpp index 52188b1..72d7808 100644 --- a/ACTK1_0/se/DomainRegistrantTransferResponse.hpp +++ b/ACTK1_0/se/DomainRegistrantTransferResponse.hpp @@ -7,7 +7,7 @@ /** * Use this to access registrant transfer data for a domain as provided in an * EPP registrantTransfer response using the - * \c urn:X-ar:params:xml:ns:registrant-1.0 namespace. Such a service + * \c urn:X-ac:params:xml:ns:registrant-1.0 namespace. Such a service * element is sent by a compliant EPP server in response to a valid domain * registrant transfer command, implemented by the * DomainRegistrantTransferCommand. diff --git a/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp b/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp index 6422216..bc790b5 100644 --- a/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp +++ b/ACTK1_0/se/DomainRegistrantTransferResponseTest.cpp @@ -11,7 +11,7 @@ void doWork() { init("./etc/toolkit2.conf"); const string xml = - "Command completed successfullyexample.com2009-04-03T22:00:00.0ZABC-1234554321-XYZ"; + "Command completed successfullyexample.com2009-04-03T22:00:00.0ZABC-1234554321-XYZ"; DomainRegistrantTransferResponse response; diff --git a/ACTK1_0/se/DomainUpdateCommandTest.cpp b/ACTK1_0/se/DomainUpdateCommandTest.cpp index 8499d47..dd9739f 100644 --- a/ACTK1_0/se/DomainUpdateCommandTest.cpp +++ b/ACTK1_0/se/DomainUpdateCommandTest.cpp @@ -94,7 +94,7 @@ void testSyncExpiryDateExtension(void) delete newExpiryDate; ASSERT_EQ(xml, - "ACTKUTST.mop.biz2005-04-03T22:00:00.0ZACTKUTST.20140101.010101.0"); + "ACTKUTST.mop.biz2005-04-03T22:00:00.0ZACTKUTST.20140101.010101.0"); } void testSyncExpiryDateExtensionWithNullDate(void) diff --git a/ACTK1_0/se/KVExtension.cpp b/ACTK1_0/se/KVExtension.cpp index 0debded..1bca872 100644 --- a/ACTK1_0/se/KVExtension.cpp +++ b/ACTK1_0/se/KVExtension.cpp @@ -4,12 +4,12 @@ std::string& KVExtension::getURI() const { - static std::string uri = "urn:X-ar:params:xml:ns:kv-1.0"; + static std::string uri = "urn:X-ac:params:xml:ns:kv-1.0"; return uri; } std::string& KVExtension::getSchemaLocation() const { - static std::string loc = "urn:X-ar:params:xml:ns:kv-1.0 kv-1.0.xsd"; + static std::string loc = "urn:X-ac:params:xml:ns:kv-1.0 kv-1.0.xsd"; return loc; } diff --git a/ACTK1_0/se/RegistrantObjectType.cpp b/ACTK1_0/se/RegistrantObjectType.cpp index c8e8efe..586cbec 100644 --- a/ACTK1_0/se/RegistrantObjectType.cpp +++ b/ACTK1_0/se/RegistrantObjectType.cpp @@ -8,13 +8,13 @@ const std::string& RegistrantObjectType::getName() const { } const std::string& RegistrantObjectType::getURI() const { - static const std::string uri = "urn:X-ar:params:xml:ns:registrant-1.0"; + static const std::string uri = "urn:X-ac:params:xml:ns:registrant-1.0"; return uri; } const std::string& RegistrantObjectType::getSchemaLocation() const { static const std::string schemaLocation = - "urn:X-ar:params:xml:ns:registrant-1.0 registrant-1.0.xsd"; + "urn:X-ac:params:xml:ns:registrant-1.0 registrant-1.0.xsd"; return schemaLocation; } diff --git a/ACTK1_0/se/SyncExtension.cpp b/ACTK1_0/se/SyncExtension.cpp index ff48d6b..73d94ea 100644 --- a/ACTK1_0/se/SyncExtension.cpp +++ b/ACTK1_0/se/SyncExtension.cpp @@ -4,13 +4,13 @@ std::string& SyncExtension::getURI() const { - static std::string uri = "urn:X-ar:params:xml:ns:sync-1.0"; + static std::string uri = "urn:X-ac:params:xml:ns:sync-1.0"; return uri; } std::string& SyncExtension::getSchemaLocation() const { - static std::string loc = "urn:X-ar:params:xml:ns:sync-1.0 sync-1.0.xsd"; + static std::string loc = "urn:X-ac:params:xml:ns:sync-1.0 sync-1.0.xsd"; return loc; } diff --git a/AusRegCliever/build/drde-cliever b/AusRegCliever/build/drde-cliever deleted file mode 100755 index 4528aee..0000000 Binary files a/AusRegCliever/build/drde-cliever and /dev/null differ diff --git a/AusRegCliever/server/mdAusReg.cpp b/AusRegCliever/server/mdAusReg.cpp index 79a3274..b109388 100644 --- a/AusRegCliever/server/mdAusReg.cpp +++ b/AusRegCliever/server/mdAusReg.cpp @@ -9,7 +9,9 @@ #include "se/DomainCheckCommand.hpp" #include "se/DomainCheckResponse.hpp" #include "se/LPE/LPChkCmdExtension.hpp" +#include "se/LPE/LPChkRespExtension.hpp" #include "se/LPE/LPCrtCmdExtension.hpp" +#include "se/LPE/LPCrtRespExtension.hpp" #include "se/TransferOp.hpp" #include "se/IntPostalInfo.hpp" #include "se/ContactCreateCommand.hpp" @@ -105,11 +107,13 @@ void ausRegEPPTK::doOTEB() { bool addDomains = true, debug=true, contactCreated = true, doTransfers = false, transferGainer = false; - int cmd=0; + int cmd=0; const char *thatAccount="secura2-ote", *thisAccount="secura1-ote"; string op("newInstance"); - const string chkPhase("claims"), crtPhase("sunrise"); + const string claims("claims"), sunrise("sunrise"), + landrush("landrush"); + Transaction thisTest; scenario(thisConfig->tkScenario,thisConfig->cfg_path); @@ -186,9 +190,11 @@ void ausRegEPPTK::doOTEB() theseLogs->logN(1,"(%d) LPE Check of unicycles.bike",cmd++); DomainCheckCommand oteCommand_2("unicycles.bike"); - LPChkCmdExtension chkE(&chkPhase); + LPChkCmdExtension chkE(&claims); oteCommand_2.appendExtension(chkE); DomainCheckResponse oteResponse_2; + LPChkRespExtension chkRspE; + oteResponse_2.registerExtension(&chkRspE); try { thisTest = Transaction(&oteCommand_2, &oteResponse_2); @@ -202,7 +208,7 @@ void ausRegEPPTK::doOTEB() } catch (...) { - theseLogs->logN(2,"General Exception OTE B (%s).",op.c_str()); + theseLogs->logN(1,"General Exception OTE B (%s).",op.c_str()); } // Used in all of below @@ -215,39 +221,48 @@ void ausRegEPPTK::doOTEB() std::vector ns(1,std::string("ns1.google.com") );; - theseLogs->logN(2,"skip: (%d) create more domains in OTE %s.",cmd++, thisAccount); + theseLogs->logN(2," (%d) create in OTE %s.",cmd++, thisAccount); + LPCrtCmdExtension crtE1(&sunrise); if (addDomains) { try { + if (1) { DomainCreateCommand oteCommand_3(name3,pw,&RID, &tech, &ns, &admin, &billing); + oteCommand_3.appendExtension(crtE1); DomainCreateResponse oteResponse_3; + LPCrtRespExtension crtRespE; + oteResponse_3.registerExtension(&crtRespE); thisTest = Transaction(&oteCommand_3, &oteResponse_3); manager->execute(thisTest); - + } if (0) { DomainCreateCommand oteCommand_3a(name2,pw,&RID, &tech, &ns, &admin, &billing); + oteCommand_3a.appendExtension(crtE1); DomainCreateResponse oteResponse_3a; thisTest = Transaction(&oteCommand_3a, &oteResponse_3a); manager->execute(thisTest); - + } if (0) { DomainCreateCommand oteCommand_3b(name5,pw,&RID, &tech, &ns, &admin, &billing); + oteCommand_3b.appendExtension(crtE1); DomainCreateResponse oteResponse_3b; thisTest = Transaction(&oteCommand_3b, &oteResponse_3b); manager->execute(thisTest); - + } if (0) { DomainCreateCommand oteCommand_3c(name4,pw,&RID, &tech, &ns, &admin, &billing); + oteCommand_3c.appendExtension(crtE1); DomainCreateResponse oteResponse_3c; thisTest = Transaction(&oteCommand_3c, &oteResponse_3c); manager->execute(thisTest); + } } catch (EPPException& e) { const char *eMsg = e.getMessage().c_str(); @@ -257,13 +272,11 @@ void ausRegEPPTK::doOTEB() } catch (...) { - theseLogs->logN(2,"General Exception OTE B (%s).",op.c_str()); + theseLogs->logN(1,"General Exception OTE B (%s).",op.c_str()); } } - theseLogs->logN(2,"skip %s (%d) %s -> %s.", - (transferGainer ? "Request" : "Approve"),cmd++, - name1,thatAccount); + theseLogs->logN(4,"skip %s (%d) %s -> %s.", (transferGainer ? "Request" : "Approve") ,cmd++, name1,thatAccount); if (doTransfers) { @@ -287,24 +300,47 @@ void ausRegEPPTK::doOTEB() } - theseLogs->logN(1,"(%d) Sunrise create %s with ICANN SMD test files.",cmd++,name5); + theseLogs->logN(2,"(%d) Sunrise create %s with ICANN SMD test files.",cmd++,name5); DomainCreateCommand oteCommand_5(name5,pw,&RID, &tech, &ns, &admin, &billing); - LPCrtCmdExtension crtE(&crtPhase); - oteCommand_5.appendExtension(crtE); + oteCommand_5.appendExtension(crtE1); DomainCreateResponse oteResponse_5; + try { thisTest = Transaction(&oteCommand_5, &oteResponse_5); manager->execute(thisTest); + } + catch (EPPException& e) + { const char *eMsg = e.getMessage().c_str(); + const char *opNow = op.c_str(); + theseLogs->logN(2,"EPP Exception during OTE B (%s): %s .",opNow,eMsg); + throw e; + } + catch (...) + { + theseLogs->logN(1,"General Exception OTE B (%s).",op.c_str()); + } theseLogs->logN(1,"(%d) Create test-validate.claimsgasix (TCN).",cmd++); DomainCreateCommand oteCommand_6("test-validate.claimsgasix",pw,&RID, &tech, &ns, &admin, &billing); - oteCommand_6.appendExtension(crtE); + oteCommand_6.appendExtension(crtE1); DomainCreateResponse oteResponse_6; + try { thisTest = Transaction(&oteCommand_6, &oteResponse_6); manager->execute(thisTest); + } + catch (EPPException& e) + { const char *eMsg = e.getMessage().c_str(); + const char *opNow = op.c_str(); + theseLogs->logN(2,"EPP Exception during OTE B (%s): %s .",opNow,eMsg); + throw e; + } + catch (...) + { + theseLogs->logN(1,"General Exception OTE B (%s).",op.c_str()); + } theseLogs->logN(0,"End OTE Session.");