Merge pull request #30112 from m-kuhn/ssl_certificate_check_fixes

Remove debug stuff
qgis · Jun 7, 2019 · bb2ee21 · bb2ee21
2 parents 43e6ee0 + 71c3205
commit bb2ee21
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 53 deletions.
diff --git a/src/auth/basic/qgsauthbasicmethod.cpp b/src/auth/basic/qgsauthbasicmethod.cpp
@@ -127,14 +127,6 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
     {
       caparam = "sslrootcert='" + caFilePath + "'";
     }
-    QFile f( caFilePath );
-    if ( !f.open( QFile::ReadOnly | QFile::Text ) )
-    {
-      qWarning() << "Could not open ca cert file!!";
-    }
-    QTextStream in( &f );
-    qWarning() << caparam;
-    qWarning() << f.size() << in.readAll();
   }
 
   // Branch for OGR
@@ -290,7 +282,6 @@ bool QgsAuthBasicMethod::updateDataSourceUriItems( QStringList &connectionItems,
       else
       {
         connectionItems.append( caparam );
-        qWarning() << QStringLiteral( "Connection items after appending %1" ).arg( connectionItems.join( "&" ) );
       }
     }
   }

diff --git a/tests/src/python/test_authmanager_password_postgres.py b/tests/src/python/test_authmanager_password_postgres.py
@@ -100,11 +100,6 @@ def setUpClass(cls):
         cls.certsdata_path = os.path.join(unitTestDataPath('auth_system'), 'certs_keys')
         cls.sslrootcert_path = os.path.join(cls.certsdata_path, 'chains_subissuer-issuer-root_issuer2-root2.pem')
 
-        def printMessage(tag, msg, level):
-            with open('/tmp/fmt.log', 'a') as f:
-                f.write('{}: {}'.format(tag, msg))
-        QgsApplication.instance().messageLog().messageReceived.connect(printMessage)
-
     def setUp(self):
         """Run before each test."""
         pass

diff --git a/tests/testdata/auth_system/certs_keys/postgres.crt b/tests/testdata/auth_system/certs_keys/postgres.crt
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIUIw1V6Ryvz+3F/eYzlydwzjmTsNYwDQYJKoZIhvcNAQEL
+MIIC4TCCAkqgAwIBAgIUJw9lSDdnviLdB6sxy9Y/vzPW9MIwDQYJKoZIhvcNAQEL
 BQAwgacxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZBbGFza2ExEjAQBgNVBAcTCUFu
 Y2hvcmFnZTEVMBMGA1UEChMMUUdJUyBUZXN0IENBMR4wHAYDVQQLExVDZXJ0aWZp
 Y2F0ZSBBdXRob3JpdHkxGjAYBgNVBAMTEVFHSVMgVGVzdCBSb290IENBMSAwHgYJ
-KoZIhvcNAQkBFhF0ZXN0Y2VydEBxZ2lzLm9yZzAeFw0xOTA2MDUyMDQyNTRaFw0y
-MDA2MDQyMDQyNTRaMBMxETAPBgNVBAMMCHBvc3RncmVzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnBscESb+Xr5zVnC+lhQBTN++LkWFHRNqqJ2jk9K7
-XavoOhKLE925XvQGxIJEPgYYlp0sxDvmfeHqsH86EpLyvhsGCYZ3/UoFKeRHotvW
-e4sHQDyZSt6P/OwVgGl/fy24fWoKtL95MsDMUGwO6XftXTcNYO9fSlLLUOa0iovu
-bjPJJupRHjBjouelRFOGAT+UkcN1j8VLxVVZUlrnwThxtIcqnMiGHTbGXq//Tbjc
-amrnUhLTO33jJ3UKlMxG29eYpqKv9p0nv/xJHXpOpHW+OErYkI3TmALwu0JEnEwP
-+0jkEP+H19/1OPqMzAkO1J684W/wTzfVdkIokM3oRqdkowIDAQABoxcwFTATBgNV
-HREEDDAKgghwb3N0Z3JlczANBgkqhkiG9w0BAQsFAAOBgQB2fNbyVLGk9WHcKVb7
-8buV81ILFo18KdoQFD4kzrr896YjvaD90o5OiYeF0EAHZdyKIA0Bzdl/8dXKG6/7
-udGW81XxNU/1sI5H20sm1gDvj9BQ6UxT/oOalbJKolEhgtU2KA1Hdh2hxrrQ9Zqu
-hB/ykiE7sCbaeeQl1iEZxgnyDA==
+KoZIhvcNAQkBFhF0ZXN0Y2VydEBxZ2lzLm9yZzAgFw0xOTA2MDYxNTQwMDNaGA8z
+MDE4MTAwNzE1NDAwM1owEzERMA8GA1UEAwwIcG9zdGdyZXMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDAT15f4ATemfsJk1x3jnonxSbhEVwEzJl4F3/c
+uYKKx6J5ZfvLGXFkMaIlTMoJ0C2Zci0vEkKN7WZLQdjk/GaAoyQv9KKeNA6CjHPs
+B7SoU0l0c6tV+SQYuyYB0LpmZaDNXwhnqkZE33ZlEUZeVtI4xMML/zIZU6A7jPSQ
+cbv/2QWUsMWKbp/x/YzFnu6zMvLrNZ6rBi3WQO/bWfhTrqKsMWpAx2L2oWL9aeQS
+/ItRu51FgiF3JopsFpR1SbBtBS09Tl6VKkdr/NQer9BdKga6mdxm7Zt5sdimpeBP
+4JG1MbcIUb4S6Rk105Gj2YBxDiIASD5s5GUmW6MAH0a/EgXNAgMBAAGjFzAVMBMG
+A1UdEQQMMAqCCHBvc3RncmVzMA0GCSqGSIb3DQEBCwUAA4GBAGFlNtrr1db0Ab0u
+q8oCCol51l/GuPhN+U0GgrmMmsFpTNC2kYGbC6MRA+NX/tPpDH/ROhNMXBZHs8m+
+V/9Vc3TKT9ZuM4BEesdQHENP5hSqBb8qJhADzrcOBUJmmyIV8Cd0NeOCdmwN4mLy
+jY82gOZtHowE6V8n4KUYveBOJMoE
 -----END CERTIFICATE-----
diff --git a/tests/testdata/auth_system/certs_keys/postgres.key b/tests/testdata/auth_system/certs_keys/postgres.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCcGxwRJv5evnNW
-cL6WFAFM374uRYUdE2qonaOT0rtdq+g6EosT3ble9AbEgkQ+BhiWnSzEO+Z94eqw
-fzoSkvK+GwYJhnf9SgUp5Eei29Z7iwdAPJlK3o/87BWAaX9/Lbh9agq0v3kywMxQ
-bA7pd+1dNw1g719KUstQ5rSKi+5uM8km6lEeMGOi56VEU4YBP5SRw3WPxUvFVVlS
-WufBOHG0hyqcyIYdNsZer/9NuNxqaudSEtM7feMndQqUzEbb15imoq/2nSe//Ekd
-ek6kdb44StiQjdOYAvC7QkScTA/7SOQQ/4fX3/U4+ozMCQ7Unrzhb/BPN9V2QiiQ
-zehGp2SjAgMBAAECggEAI7qwudxK7DR7AZXciU0a3xV22fBff0AqcV1jSzo4WEA4
-btI/stRU0T7ZLbEDHY8XoaFn1aJAJx/GL49vI0Eu/gQBZby5SeffNq9hFg1rEevI
-RROZomE+Y41Ffpam79zvFQVoXeZVPyCRovaYkyc31NX84ernzIMWtfWX7P4KHH6y
-R/6iMxZVJ83LnAw5hvVctEU37Q3Hyy1LpEt1jlbxDVtyfuVgmSf5D3LerjjiFL3Y
-lREQgYDD5ttCcEnJLyU1b9s69FlG90nQSRvPYuuxeneOLwykdInehWH5VaIALpQ4
-XdTJVrP92mVtD3xqBimZK4cCU/Vups01Hv//vI/nwQKBgQDNfCw+Lhluk5G8QY8d
-eV/CV4XP3bsJxoQXIa1blKbo67zrn+Lz7kxXr4/MAQpLKQROXebQdzgLOqy9nFys
-CffVgYCtH58djIt4XZq+RjEPhiKxC63kaPsBL3UMGIeeRrFX80EJaTY/Z7SQoCBR
-Ds7G2lgew3neSEZKhT0KYty67wKBgQDCe1mMSV+Wv0bVUYy+fhAXbArr+Kq8/t35
-79cFqHbIvr8NhdeESCon1Um9CwROHyHUkbQKGH4AwT4bWSp+Z622f164b7NvorO5
-Wjj8HVzGExPvs2JmfmKtnP8Ty0D/9plXGzLVnhXnRSJb7yBrzwjoJn4eXQ0/Mmxw
-vygH3T6BjQKBgBeieqxEPSSc0Jxopf9r4HnH+1onVMYREUxf0ULBXFlaFAa+Ayqv
-dBR52v5J+FcgxqAE6PF9ZPLVsty0SWx4UQs7tAM1qeWKLtiPW6cbB7WTZhYbE8s7
-z/MY9EuJ3r9zvh4xmn9snJK6aOhhopXwMBRrNMuFDFVm1r7niFfTezP9AoGBAJey
-/7adxSIhMW9TnSU5z/N1I0/NN+EULLG4k1Cmh4EuyHgT3nggkkFf7ZS38zO8tPbK
-cFUvpZmRIpDSjILs/GNOFuRmvOBnWSlLZwfBH4yhdPuUQT0ReIdT3uPht2HxSMrZ
-PF3EYfFzy8lKTU/KvnfXDqlAjASvoEaR1PfNa+RBAoGBAKuvcYKbvJfFbr9Bk8r3
-ScHmcGOWOoT4eLBs/BgmLhSGCZ84Hyi/kXIZsqI94mjw0Y4op5ipECLjjW9qMHt4
-jIVmKqouzXloBOL+eEHfNCBr2EjGDOprF/3yxUMRSBz5EP9cVt0ML/TOPnCkO+n+
-TT/P07eOOcWLLIebjN5q/SLk
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDAT15f4ATemfsJ
+k1x3jnonxSbhEVwEzJl4F3/cuYKKx6J5ZfvLGXFkMaIlTMoJ0C2Zci0vEkKN7WZL
+Qdjk/GaAoyQv9KKeNA6CjHPsB7SoU0l0c6tV+SQYuyYB0LpmZaDNXwhnqkZE33Zl
+EUZeVtI4xMML/zIZU6A7jPSQcbv/2QWUsMWKbp/x/YzFnu6zMvLrNZ6rBi3WQO/b
+WfhTrqKsMWpAx2L2oWL9aeQS/ItRu51FgiF3JopsFpR1SbBtBS09Tl6VKkdr/NQe
+r9BdKga6mdxm7Zt5sdimpeBP4JG1MbcIUb4S6Rk105Gj2YBxDiIASD5s5GUmW6MA
+H0a/EgXNAgMBAAECggEAOzc1RChi13hqiGRL0LSagKyAcEU8JG4rw4LY6EpnG/yk
+1uTER6Gp/MQbvYiLncHwiJNTvm7M947mNL4t3zSpC2swtWOKv1QgM6qz9zXYNwyO
+TcFgPLTenI7kASMYgndAsHxWxjT0Njjo5+4N0PbC/J/5vzPxZUMOz8dzdxbOYNUV
+YguyYVrlkdovM1qJWyUBANEA+ASKmxkSLh7uU4YON/5c7yweOi5Z7KOYfDsAJmeY
+02mDBiPbIv2oWS9BguxwtKDGXC0fdI4yLpdrFWxja8Mfm8JgKuGE54iMMofwkUYP
+zirIl7C3p5eJbEZsadm/xO+Hx36ja+jMoKPiEytAgQKBgQDy7t1wOF8khRWdWR3W
+PBmIZsJa3KIn7cy7HIt2C/Vy3h30obheT2ocRr3rwLzV8Qrnqu+r/QTAl3i5s1fC
+3NeT1h2M1yuJ1XhuJAy8uZETEFQ84m9reKomSGrQ+QmydJSGWiEAU/EDX/UseZTL
+t4Kq1s6oq16ojjVLlV46HYKExQKBgQDKp2+ECrL9n40KZlehGHvbMfeHsBPqttTB
+HJDznA3N8iWqHwUbAHdQHSdqCgwzABQGGGLHr4c1RMzM61tJonjBORjUn1pJQ1P0
+WtN27ttDOo28wobdlLjyI5qP7zhCiqp4oay5C9Qd2VRcSZQ2RNvFhsAB8/s4oSDn
+tnTmYfZdaQKBgQC1Po8JTZV2SrBQn49KKbam9HumjJuSjLFFHEvUO6HZHGxe+lTy
+T++Lvx+tBzQbreWD6B0+RNxJz/irG2mroVZZHtMXI+WAxTo/ejfiidP51CH09r9I
+AFN5kmfXFyYr9RxmjFG4y+exq+LgVqkzv+sGCJNQdeJ+gPK0PHF7jE63PQKBgBcL
+CuccwFWOet8f2/75Zbv65oaLQviBaZe7w8+vgvJUAmxhspbraqW1avHnypNSAvTe
+ePzzvJAWDqOOb4bj7o8qCuTCaeXCvh0e5sSzTENMuSkphWRUsOL3oW+UZ/VJBzFI
+UPeJnMj4GVuVEkFJeyPuuo5+S6aYy8ENQiWgJf9hAoGBAOTkwvT/BpW1gCLwR0LJ
+3ILClC/xBpBtSZaJouN7EYB7TYL/a9uY8uXh3u0stktnPPk4lLRqcq7ktYVzhx84
+LyrdMWyBndmyLHVy5CQlR/BfTxnvWPq39SUeeO8+FI0LfgdsdfoHkMdFn6RCmyVo
+FlqljpfED62VGlbunHVz1EBr
 -----END PRIVATE KEY-----