From 2ba34617a2911b22af5103df416a50e2c895b346 Mon Sep 17 00:00:00 2001 From: byb11 Date: Wed, 3 Mar 2021 11:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9IpLibraries=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?TrustedCertificateAuthorities=E9=A1=B5=E9=9D=A2=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=EF=BC=8C=E4=BF=AE=E6=94=B9Settings?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E8=AF=81=E4=B9=A6=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_ui/ui_settings/IPLibrariesCase.robot | 2 +- .../TrustedCertificateAuthoritiesCase.robot | 2 +- 02-Keyword/tsg_ui/setting/Settings.robot | 4 +- .../Intermediate/camiddle.chain_365.pem | 73 +++++++++++++++++++ 4 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 05-Other/keyrings/Intermediate/camiddle.chain_365.pem diff --git a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot index 848cac7..c36c2bd 100644 --- a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot @@ -38,7 +38,7 @@ IPLibrariesEditCountry ${iplist} create list 1.1.1.1-2.2.2.2 ${a}= RandomNumber CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} Country=${a} Longitude=-1 Latitude=12.13 - EditIpLibraries Geo Name 548454 Longitude=-2 Latitude=12.13 + EditIpLibraries Geo Name ${a} Longitude=-2 Latitude=12.13 DeleteIPLibraries IPLibrariesSearchGeoName diff --git a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot index 09d0d85..e3aabad 100644 --- a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot @@ -13,7 +13,7 @@ TrustedCertificateAuthoritiesImportCa TrustedCertificateAuthoritiesImportCaroot [Tags] Positive UI Caroot Settings TrustedCertificateAuthorities - importTrustedCertificateAuthorities CreateTrustedCertificateAuthoritiesImportCaroot ${path}keyrings//Intermediate//camiddle.chain.pem name + importTrustedCertificateAuthorities CreateTrustedCertificateAuthoritiesImportCaroot ${path}keyrings//Intermediate//camiddle.chain_365.pem name click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span DeleteAuthorities_del diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index a7035e5..dd2b63b 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -638,9 +638,9 @@ importTrustedCertificateAuthorities Choose File xpath=//*[@id="upload_dome"]/div/input ${file} #上传文件 Sleep 2 click id=authoritiesAdd_sub #点击OK缇交 - Sleep 1 + Wait Until Element Is Enabled id=app_create 20 Settings-Search ${name} ${search} - Sleep 1 + sleep 2 ${text1} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span #获取点击后页面文本信息 Should Be Equal As Strings ${text1} ${name} #断言 diff --git a/05-Other/keyrings/Intermediate/camiddle.chain_365.pem b/05-Other/keyrings/Intermediate/camiddle.chain_365.pem new file mode 100644 index 0000000..edc383c --- /dev/null +++ b/05-Other/keyrings/Intermediate/camiddle.chain_365.pem @@ -0,0 +1,73 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 08:9d:48:fb:1c:85:1f:ff:b4:f8:98:9f + Signature Algorithm: sha256WithRSAEncryption + Issuer: C=CN, ST=BJ, L=BJ, O=NT, OU=NT, CN=CA TRUST + Validity + Not Before: Mar 3 02:54:01 2021 GMT + Not After : Mar 3 02:54:01 2022 GMT + Subject: C=CN, ST=BJ, O=NT, OU=NT, CN=camiddle + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (1024 bit) + Modulus: + 00:e0:d1:10:67:fb:35:6a:c4:77:e2:ae:18:00:ee: + 8c:13:1d:40:ea:8a:ef:fa:99:39:05:ea:32:5b:19: + 56:3f:08:92:b4:2c:5e:ef:06:ca:60:7e:d1:c1:91: + 03:96:fa:ef:02:34:d2:e0:b1:04:f4:38:27:3f:6a: + fc:91:ff:c4:04:e9:93:a2:fd:82:d3:42:57:77:30: + bb:1c:e2:a1:ea:07:cf:60:1a:ff:8e:8a:87:53:f9: + 6e:13:f3:43:f3:03:f1:b0:1c:89:40:25:a2:8d:7f: + 98:d3:1f:ad:71:ed:94:09:21:51:88:0f:37:bf:d3: + b1:6f:40:13:b1:cc:10:f2:6b + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 48:B1:3B:75:04:27:39:FC:C5:FE:A0:FC:A4:42:51:AC:AD:49:17:2E + X509v3 Authority Key Identifier: + keyid:5D:DE:83:D1:D5:A0:8C:A6:0F:21:BE:A6:00:01:3C:04:AA:4E:5C:65 + + X509v3 Basic Constraints: + CA:TRUE + Signature Algorithm: sha256WithRSAEncryption + 4d:5a:89:b9:28:75:8d:bd:86:f0:6c:17:9e:7b:0f:79:20:7b: + cd:fb:a0:5f:c5:15:dd:dc:0c:7b:c0:81:6c:26:5f:88:16:74: + 81:41:c1:f3:87:c1:9e:c2:e4:aa:74:2b:7d:d3:86:d8:83:4c: + 19:24:10:3e:47:03:29:3e:b2:5b:3e:fb:5a:64:81:5d:64:67: + 45:8a:76:c9:c9:91:16:09:75:57:61:64:a0:39:1e:dd:5f:ca: + db:d2:de:2e:bd:2c:59:b2:50:ac:d5:48:58:42:22:da:fc:5a: + 0c:d0:cc:1b:c7:7f:61:ec:6e:89:27:db:a6:ea:81:e9:2d:2c: + 01:0f +-----BEGIN CERTIFICATE----- +MIICbDCCAdWgAwIBAgIMCJ1I+xyFH/+0+JifMA0GCSqGSIb3DQEBCwUAMFQxCzAJ +BgNVBAYTAkNOMQswCQYDVQQIDAJCSjELMAkGA1UEBwwCQkoxCzAJBgNVBAoMAk5U +MQswCQYDVQQLDAJOVDERMA8GA1UEAwwIQ0EgVFJVU1QwHhcNMjEwMzAzMDI1NDAx +WhcNMjIwMzAzMDI1NDAxWjBHMQswCQYDVQQGEwJDTjELMAkGA1UECAwCQkoxCzAJ +BgNVBAoMAk5UMQswCQYDVQQLDAJOVDERMA8GA1UEAwwIY2FtaWRkbGUwgZ8wDQYJ +KoZIhvcNAQEBBQADgY0AMIGJAoGBAODREGf7NWrEd+KuGADujBMdQOqK7/qZOQXq +MlsZVj8IkrQsXu8GymB+0cGRA5b67wI00uCxBPQ4Jz9q/JH/xATpk6L9gtNCV3cw +uxzioeoHz2Aa/46Kh1P5bhPzQ/MD8bAciUAloo1/mNMfrXHtlAkhUYgPN7/TsW9A +E7HMEPJrAgMBAAGjUDBOMB0GA1UdDgQWBBRIsTt1BCc5/MX+oPykQlGsrUkXLjAf +BgNVHSMEGDAWgBRd3oPR1aCMpg8hvqYAATwEqk5cZTAMBgNVHRMEBTADAQH/MA0G +CSqGSIb3DQEBCwUAA4GBAE1aibkodY29hvBsF557D3kge837oF/FFd3cDHvAgWwm +X4gWdIFBwfOHwZ7C5Kp0K33ThtiDTBkkED5HAyk+sls++1pkgV1kZ0WKdsnJkRYJ +dVdhZKA5Ht1fytvS3i69LFmyUKzVSFhCItr8WgzQzBvHf2Hsbokn26bqgektLAEP +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICdjCCAd+gAwIBAgIJAKiaDrXNvq62MA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV +BAYTAkNOMQswCQYDVQQIDAJCSjELMAkGA1UEBwwCQkoxCzAJBgNVBAoMAk5UMQsw +CQYDVQQLDAJOVDERMA8GA1UEAwwIQ0EgVFJVU1QwHhcNMjEwMzAzMDExNTIwWhcN +MjEwMzA0MDExNTIwWjBUMQswCQYDVQQGEwJDTjELMAkGA1UECAwCQkoxCzAJBgNV +BAcMAkJKMQswCQYDVQQKDAJOVDELMAkGA1UECwwCTlQxETAPBgNVBAMMCENBIFRS +VVNUMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqbNHXzJWvXFpQH58IWl5M +APyW1tdCzprU5qQsoE2iVHPM1t+UHMufoHZAGRYWel2JlFKItwMYlsrCHTQtx2BU +05w7dYaQEHzMO5LGRXnkZD+gh2/bMxdG/sX4TtLrQNhG7wbwQ9l65/sO9P1Q8/g0 +a5MKunhRQOquaWc4PJCrmQIDAQABo1AwTjAdBgNVHQ4EFgQUXd6D0dWgjKYPIb6m +AAE8BKpOXGUwHwYDVR0jBBgwFoAUXd6D0dWgjKYPIb6mAAE8BKpOXGUwDAYDVR0T +BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQCEqdagUPIlHdxd+lYb+59icvgQe2NQ +ZrOlWka/P0l2CEEnabgUVmqDuoD47PXIYfjE2I/q0TpjR9u6LiAUTiGM3kIPQumD +vZqIbR45yX4QCMdEgHV5AeZa557MIvNollhC7Jmq57ksHB5SNosG/ovwTtpYtQTl +oJfjPVdOVLbefw== +-----END CERTIFICATE-----