From 084a797079c955007e563117c1a1753fef5f24f1 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Tue, 16 Feb 2021 10:15:24 +0500 Subject: [PATCH 1/5] Remove accept insecure certs --- lib/gitlab/qa/component/gitlab.rb | 4 - lib/gitlab/qa/runtime/env.rb | 1 - .../qa/scenario/test/integration/ldap_tls.rb | 1 - .../qa/scenario/test/integration/mtls.rb | 1 - .../qa/scenario/test/integration/saml.rb | 1 - tls_certificates/gitlab/gitlab.test.crt | 31 -------- tls_certificates/gitlab/gitlab.test.key | 76 +++++++------------ 7 files changed, 26 insertions(+), 89 deletions(-) delete mode 100644 tls_certificates/gitlab/gitlab.test.crt diff --git a/lib/gitlab/qa/component/gitlab.rb b/lib/gitlab/qa/component/gitlab.rb index 98cbc635..e9ab8a06 100644 --- a/lib/gitlab/qa/component/gitlab.rb +++ b/lib/gitlab/qa/component/gitlab.rb @@ -82,10 +82,6 @@ module Gitlab @relative_path ||= '' end - def set_accept_insecure_certs - Runtime::Env.accept_insecure_certs = 'true' - end - def prepare prepare_gitlab_omnibus_config diff --git a/lib/gitlab/qa/runtime/env.rb b/lib/gitlab/qa/runtime/env.rb index c86acd3a..9590b271 100644 --- a/lib/gitlab/qa/runtime/env.rb +++ b/lib/gitlab/qa/runtime/env.rb @@ -32,7 +32,6 @@ module Gitlab 'GITLAB_URL' => :gitlab_url, 'SIMPLE_SAML_HOSTNAME' => :simple_saml_hostname, 'SIMPLE_SAML_FINGERPRINT' => :simple_saml_fingerprint, - 'ACCEPT_INSECURE_CERTS' => :accept_insecure_certs, 'EE_LICENSE' => :ee_license, 'GCLOUD_ACCOUNT_EMAIL' => :gcloud_account_email, 'GCLOUD_ACCOUNT_KEY' => :gcloud_account_key, diff --git a/lib/gitlab/qa/scenario/test/integration/ldap_tls.rb b/lib/gitlab/qa/scenario/test/integration/ldap_tls.rb index a92618c0..8699b956 100644 --- a/lib/gitlab/qa/scenario/test/integration/ldap_tls.rb +++ b/lib/gitlab/qa/scenario/test/integration/ldap_tls.rb @@ -15,7 +15,6 @@ module Gitlab end def configure_omnibus(gitlab) - gitlab.set_accept_insecure_certs gitlab.omnibus_config = <<~OMNIBUS gitlab_rails['ldap_enabled'] = true; gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config}; diff --git a/lib/gitlab/qa/scenario/test/integration/mtls.rb b/lib/gitlab/qa/scenario/test/integration/mtls.rb index 0e94227b..4bfcb7cd 100644 --- a/lib/gitlab/qa/scenario/test/integration/mtls.rb +++ b/lib/gitlab/qa/scenario/test/integration/mtls.rb @@ -21,7 +21,6 @@ module Gitlab gitaly.network = @network gitaly.skip_availability_check = true - gitaly.set_accept_insecure_certs gitaly.omnibus_config = gitaly_omnibus gitaly.mtls diff --git a/lib/gitlab/qa/scenario/test/integration/saml.rb b/lib/gitlab/qa/scenario/test/integration/saml.rb index 6ee826d9..45850417 100644 --- a/lib/gitlab/qa/scenario/test/integration/saml.rb +++ b/lib/gitlab/qa/scenario/test/integration/saml.rb @@ -24,7 +24,6 @@ module Gitlab gitlab.release = release gitlab.network = 'test' gitlab.name = gitlab_name - gitlab.set_accept_insecure_certs if saml_component Component::SAML.perform do |saml| diff --git a/tls_certificates/gitlab/gitlab.test.crt b/tls_certificates/gitlab/gitlab.test.crt deleted file mode 100644 index 6c7ec02f..00000000 --- a/tls_certificates/gitlab/gitlab.test.crt +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFSjCCAzICCQDft0SZAQGuIzANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDzANBgNVBAoM -BkdpdExhYjEMMAoGA1UECwwDT3JnMRQwEgYDVQQDDAtnaXRsYWIudGVzdDAeFw0x -ODEwMjUwOTU0MzRaFw0yODEwMjIwOTU0MzRaMGcxCzAJBgNVBAYTAlVTMQswCQYD -VQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGR2l0TGFi -MQwwCgYDVQQLDANPcmcxFDASBgNVBAMMC2dpdGxhYi50ZXN0MIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAykiE+PF8CBAP/k0NMHiMJ+TqMnupLl5Ypo0N -TH/Y8qFEqV4MaiGoqHwHiqY3tC0Zshe7uowS7NDnmTH/5DeNOmi/zI+FhTEHJKhP -DM5Q0MXJrUIi6eGmojB5l/3t3OBnvoFaC0zpkpg5uR8QL5RbB8Gyf5/5eCEbP3/h -R2q9JFUOEyTYEyv+1K/WegQyaLPtiPtvfTTmx1uEDfP1vuiMKuPOQ/3N8nFky1ny -8c0P2wQv6E/qtRafKxaPbA/OmSpx0JGol43EjgOqy5FIJBT+yYP2navvAw+BvZ3k -6qiQL6dx5pOGPAd8uxLmcj4In54IZWxs8fxUlNpcLWbo8noVxIQP2j7MAGXwGatM -eaUnyD5DmHlHS92gvHU3nKagDEuJjnBCCWtaVugeAWuW+8fJHgYbwuRQ8h/5hTWc -T80cEHDmKB/Uft4QLc65C7LQjKmfeX5qLgufk+dMmWj116csejiTFPCue0/RjSxK -C/562dbt/ZcScLXymkUiewc7FzHKExquY42I/yudoMYS9EBAyDcDE72WrUcIpECH -OMIt+EgXoDw1e/aTc5orlBIFjhknnPnP5RtrBj/OdXEgwMfD/N+ZYpY43ZIjBHWM -Zpj4YxLdBXkFJ/JG632Pp+bOgF5TgzCnV2Je6r1VMAAH8U0B105xAnyl5qtepUO5 -+THpCdUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEADFyEMU0aLOrNO60PerQ25kE9 -jqzVhySyg6Pwsus7LIKTQLeo9abGmdjcbuqmBRLdxCYHbjbgW07I28YS4x4m7/ay -YAePaMRb4Qt1yyaWcPIsw57sMnoC8iqRqXJPyr8i9F+RtzoC7Hki6zORxms8TF5C -FbNB2ZBO/mbe8Lro0G1j5rxrvndQ6/OnwLQFW/VCfDDOIM7TXm6yYyiUpj3MSBay -LDJaT9N5xMxF82OjcMB0/flWFxI7QmNXTe7M6HQbp05Jyw9VCEAVflI7zkaYY329 -7XvVJbpf1A3SegqxGlF2gD31cxViYBRV7t0pO6mcwt0/iAzAVicg/qtoPUg8zFwN -xU89jk+UV5oTQc06u6CbIuF1eYy3MJGmQlCsEd/OOC9zl7xRHBA4ro3CTCH238L6 -lGEi8FRombuPcv3hD9PuW/RAQ5v03lF9D7UVtEHtb2VCZ0EXL8YFRuqQpPvdPqQ+ -znaohk2jKRSttvZCXw5TaWdDctDue/b70cEVPoAzXACjaX/oOau+MJvMaI7i5BXF -JhBcoXh7FXIgyDszzgGq5DxjCcpy0X5o2TGC5id8zUNBY8ek6UV3mHk2FQzYf+7C -8Qvv++R3+Ubk5DryuuWa/R2ybemQja830Fgiab9hgvhhgCOCbmxLIKVrePenMOXc -vvjQTrP9ZinR50bKUf8= ------END CERTIFICATE----- diff --git a/tls_certificates/gitlab/gitlab.test.key b/tls_certificates/gitlab/gitlab.test.key index 934a30ad..6ba5b990 100644 --- a/tls_certificates/gitlab/gitlab.test.key +++ b/tls_certificates/gitlab/gitlab.test.key @@ -1,52 +1,28 @@ -----BEGIN PRIVATE KEY----- -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 -x++63Pu+UaiR5UttNHmAr7AnrGw+Iw== +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDW46fBgBE+Rk/q +CC8OSUHOauB86XKrsoaQik6YYYpoRcnQLqbLUaN284/9our5RZP/vo2J9r1XGGDg +QFvsh9fz6zsaLpT71cbWjfvHqeQNxey2yKlJ63ZIzFfs5cW2O8H9AIYmLTHm7c+n +Ama0rJ0GVYR2rMQ0uBdOtA1qQnWKrWImSNqt2XdPnrwGKg6M52UBAtBN4WLluC+v +pAMLAMuNvoAeE3DfQAAZxDgmiXLym1jtg25Cyu4I+A9bj8bi6B5CavGm3onZDbbV +EB5POWPLl+YH54pwNt4LG/jw1eGicOD/j5ztQsxHImK/0UFypQMd7ODw0DjERGBc +/4p5O7LNAgMBAAECggEAI/MqGYEnYVe5/tknpigzTikrLTqQ6JCRWpUI2Q1YbmFe +hemIFfOueTP+HtymmtU9EUf7vdz9iBiX/GxH9KY1RqVP2e15FziIb1SJjrmpYXR/ +SYUAbVFrFHq7KvK1xOryZTU1PCXLd2rJlpMcQ5WtH2YnJwN4P6mcnJoatHAx4eUZ +Q1Kp/xEkCUbqg3yXDUeWUmcUTvye7T2g+QVpiBBt6Xxl01CJk/ylywA7muXlAZdT +FKtx6tm166IRiBXDf3eCcUo6lAcBR+6yaFPlEdf0znqlvNujzRdFaCZLdnZ/cgI7 +0kpoBZHJ44BxDr9YzwAl1rD+Zvk4DTixmIRtbSNhAQKBgQDzFRj1oBcvagROzx5q +O6kzFNoznx8t67Uss0ZL41VQuDc/NK+BituQjc55QpcfutD0QG/Uf0Gw+GCEKpNl +YPA4sWGHHXPL6lvrgnjisrzc5IlJZAQeSaPIdVpuAV7bnVxM3FSNo8h2VbKg2ioI +wHBFyCqDmcY3Hl/Fr0fI7RD+sQKBgQDiTwRvPYE0Ug+k6qsCspgNQ7tePtkLXyW0 +GOPF+HVzUVF5JKRbkGT0XWax1c8F/bCxiqXMnIFIJcsSSTEo4XFccRRYvR8nTvyk +xcnSOCeRTl3OnnBvltvgFRABQEzzVCXoXnxKOIfkEAQmyMjC3kRRNXimMKl1B3mZ +b6e9ZsoU3QKBgDcDX1K3mIeyhqcPWOLR/ckBvyBPss7BuY8UQ6SJHpXWGyrC0bWP +p4Fflor69xjHPuMIcka1Rji2/aDrwc//0F4ERv49PCe6MnNqY9FqgjO7xRZG/Gee +YuLLLFwZE07AnlMGylwD5Spi2rpspXa1lrM0Seresm1nAmXK9YQTovUBAoGAECvL +SlOfxuhSO9uU6rVuTgxX+C0Pf1OGMy9QH1ZYtivKYZivsedIf3mpG+4GRAxTsuwQ +WuWYC1q//weB3sT1P8DIzmp9LmbjgLatbDsdALIT2+7QY/jor0NyCFTa6sxJhSgz +Q250r2RBl6/jQKF3SkJC48U4ZqdpFgC3gL42lHUCgYEA5v1U6/DCh8THQouo9DKP +wpvZJUGR9usH5htyrcWeqn9y/761RQNFUjn98MIThmVJn/v71IcALN/EsWakmJIY +PHfwmjy4OS04Vfrzsz01H7FWb3a3GNTcA+SKtkEN8G3P8lGovxA7wHMnL2pVfEvt +HNRxxiNOeFi+cpd5qmo+iNI= -----END PRIVATE KEY----- -- GitLab From 3d1417247ca244bf025fe9d2cc2e310cd97673b5 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Tue, 16 Feb 2021 10:15:29 +0500 Subject: [PATCH 2/5] Remove accept insecure certs --- tls_certificates/gitlab/gitlab.test.crt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tls_certificates/gitlab/gitlab.test.crt diff --git a/tls_certificates/gitlab/gitlab.test.crt b/tls_certificates/gitlab/gitlab.test.crt new file mode 100644 index 00000000..f4b929bb --- /dev/null +++ b/tls_certificates/gitlab/gitlab.test.crt @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIJAOx4HbseI/XnMA0GCSqGSIb3DQEBBQUAMFExCzAJBgNV +BAYTAlVTMQswCQYDVQQIDAJUWDEPMA0GA1UECgwGR2l0TGFiMQswCQYDVQQLDAJI +UTEXMBUGA1UEAwwOR2l0TGFiIENBIDIwMjEwHhcNMjEwMjE2MDM0NTUxWhcNMzEw +MjE0MDM0NTUxWjCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlRYMRAwDgYDVQQH +DAdIb3VzdG9uMRkwFwYDVQQKDBBUZXN0aW5nIFB1cnBvc2VzMQswCQYDVQQLDAJI +UTEUMBIGA1UEAwwLZ2l0bGFiLnRlc3QxHDAaBgkqhkiG9w0BCQEWDW5vbmVAbm9u +ZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDW46fBgBE+Rk/q +CC8OSUHOauB86XKrsoaQik6YYYpoRcnQLqbLUaN284/9our5RZP/vo2J9r1XGGDg +QFvsh9fz6zsaLpT71cbWjfvHqeQNxey2yKlJ63ZIzFfs5cW2O8H9AIYmLTHm7c+n +Ama0rJ0GVYR2rMQ0uBdOtA1qQnWKrWImSNqt2XdPnrwGKg6M52UBAtBN4WLluC+v +pAMLAMuNvoAeE3DfQAAZxDgmiXLym1jtg25Cyu4I+A9bj8bi6B5CavGm3onZDbbV +EB5POWPLl+YH54pwNt4LG/jw1eGicOD/j5ztQsxHImK/0UFypQMd7ODw0DjERGBc +/4p5O7LNAgMBAAGjQjBAMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgWgMCAG +A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOC +AQEAn0WFlqiDXs2OwXZlLPUdFFDvXPj/RsL7/1ufMG0v0DdguZth4+W+F+xCujxF +6cghlBXAsvobRPlc5wKPW5eLFN+6PWjxv79upX5MLI2wPXxH5G1ATz5Idtdh9nKh +4a+VZvBGHeqkduBLkB4xqp6e55QzR/drmDJ4+FVGD/Wv1sH6HQrUw9PThnrAdnvH +7jCtf09UJUDQ3fxWRohrSdrh1o3aQSFMb3BkHLZZsBd+d3wvYCi7hMmkg3qDLuX6 +HW7GLgddSCMPCYk3ltPuK8Qub42L7b5X6wxCuisZzmd/LHloR1jVISlor8jr+B94 ++bdj4qPZ7gxxMuxAimci459HWA== +-----END CERTIFICATE----- -- GitLab From e4b5070a8c71aafd8ebd1223c253a68cb4c48170 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Tue, 16 Feb 2021 13:49:55 +0500 Subject: [PATCH 3/5] Remove unneededset_accept_insecure_certs --- lib/gitlab/qa/scenario/test/integration/mtls.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gitlab/qa/scenario/test/integration/mtls.rb b/lib/gitlab/qa/scenario/test/integration/mtls.rb index 4bfcb7cd..ba1fd32f 100644 --- a/lib/gitlab/qa/scenario/test/integration/mtls.rb +++ b/lib/gitlab/qa/scenario/test/integration/mtls.rb @@ -30,7 +30,6 @@ module Gitlab gitlab.name = @gitlab_name gitlab.network = @network - gitlab.set_accept_insecure_certs gitlab.omnibus_config = gitlab_omnibus gitlab.tls = true gitlab.set_trusted_certificates -- GitLab From 1e5271c28eda3eb0379467d200b05d9eeedff862 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Tue, 16 Feb 2021 16:00:12 +0500 Subject: [PATCH 4/5] TLS is enabled by default so no need to set it --- lib/gitlab/qa/component/ldap.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/gitlab/qa/component/ldap.rb b/lib/gitlab/qa/component/ldap.rb index 49652640..ec2ceda8 100644 --- a/lib/gitlab/qa/component/ldap.rb +++ b/lib/gitlab/qa/component/ldap.rb @@ -29,14 +29,9 @@ module Gitlab @volumes[FIXTURE_PATH] = BOOTSTRAP_LDIF end - # LDAP_TLS is true by default + # TLS is enabled by default (LDAP_TLS is true by default) def tls=(status) - if status - @environment['LDAP_TLS_CRT_FILENAME'] = "#{hostname}.crt" - @environment['LDAP_TLS_KEY_FILENAME'] = "#{hostname}.key" - @environment['LDAP_TLS_ENFORCE'] = 'true' - @environment['LDAP_TLS_VERIFY_CLIENT'] = 'never' - else + unless status @environment['LDAP_TLS'] = 'false' end end -- GitLab From d320ec1806b035c6c7909308b6bf972e478eff37 Mon Sep 17 00:00:00 2001 From: "Sanad Liaquat (Personal)" Date: Tue, 16 Feb 2021 16:53:58 +0500 Subject: [PATCH 5/5] Fix rubocop lint --- lib/gitlab/qa/component/ldap.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/qa/component/ldap.rb b/lib/gitlab/qa/component/ldap.rb index ec2ceda8..217477ee 100644 --- a/lib/gitlab/qa/component/ldap.rb +++ b/lib/gitlab/qa/component/ldap.rb @@ -29,11 +29,9 @@ module Gitlab @volumes[FIXTURE_PATH] = BOOTSTRAP_LDIF end - # TLS is enabled by default (LDAP_TLS is true by default) + # LDAP_TLS is true by default def tls=(status) - unless status - @environment['LDAP_TLS'] = 'false' - end + !status && (@environment['LDAP_TLS'] = 'false') end def username -- GitLab