From 171c05d6978e14643cb6e710a5a68e6cf97a27c3 Mon Sep 17 00:00:00 2001 From: mserranom Date: Mon, 29 Jan 2024 12:47:56 +0100 Subject: [PATCH] Rebrand SAML env variables to Overleaf GitOrigin-RevId: a0e5c19ea2e5738e4930b00bf60fd5f37fc07f37 --- services/web/docker-compose.common.env | 18 +++++++++--------- services/web/local-dev.env | 4 ++-- services/web/local-test.env | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/web/docker-compose.common.env b/services/web/docker-compose.common.env index 69ccd8c564..3f34f7dd00 100644 --- a/services/web/docker-compose.common.env +++ b/services/web/docker-compose.common.env @@ -29,16 +29,16 @@ OVERLEAF_LDAP_NAME_ATT=cn OVERLEAF_LDAP_LAST_NAME_ATT=sn OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN=true # Server-Pro SAML -SHARELATEX_SAML_ENTRYPOINT=http://saml/simplesaml/saml2/idp/SSOService.php -SHARELATEX_SAML_CALLBACK_URL=http://saml/saml/callback -SHARELATEX_SAML_ISSUER=overleaf-test-saml -SHARELATEX_SAML_IDENTITY_SERVICE_NAME="SAML Test Server" -SHARELATEX_SAML_EMAIL_FIELD=email -SHARELATEX_SAML_FIRST_NAME_FIELD=givenName -SHARELATEX_SAML_LAST_NAME_FIELD=sn -SHARELATEX_SAML_UPDATE_USER_DETAILS_ON_LOGIN=true +OVERLEAF_SAML_ENTRYPOINT=http://saml/simplesaml/saml2/idp/SSOService.php +OVERLEAF_SAML_CALLBACK_URL=http://saml/saml/callback +OVERLEAF_SAML_ISSUER=overleaf-test-saml +OVERLEAF_SAML_IDENTITY_SERVICE_NAME="SAML Test Server" +OVERLEAF_SAML_EMAIL_FIELD=email +OVERLEAF_SAML_FIRST_NAME_FIELD=givenName +OVERLEAF_SAML_LAST_NAME_FIELD=sn +OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN=true # simplesaml cert from https://github.com/overleaf/google-ops/tree/master/docker-images/saml-test/var-simplesamlphp/cert -SHARELATEX_SAML_CERT=MIIDXTCCAkWgAwIBAgIJAOvOeQ4xFTzsMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMTE1MTQxMjU5WhcNMjYxMTE1MTQxMjU5WjBFMQswCQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCT6MBe5G9VoLU8MfztOEbUhnwLp17ak8eFUqxqeXkkqtWB0b/cmIBU3xoQoO3dIF8PBzfqehqfYVhrNt/TFgcmDfmJnPJRL1RJWMW3VmiP5odJ3LwlkKbZpkeT3wZ8HEJIR1+zbpxiBNkbd2GbdR1iumcsHzMYX1A2CBj+ZMV5VijC+K4P0e9c05VsDEUtLmfeAasJAiumQoVVgAe/BpiXjICGGewa6EPFI7mKkifIRKOGxdRESwZZjxP30bI31oDN0cgKqIgSJtJ9nfCn9jgBMBkQHu42WMuaWD4jrGd7+vYdX+oIfArs9aKgAH5kUGhGdew2R9SpBefrhbNxG8QIDAQABo1AwTjAdBgNVHQ4EFgQU+aSojSyyLChP/IpZcafvSdhj7KkwHwYDVR0jBBgwFoAU+aSojSyyLChP/IpZcafvSdhj7KkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABl3+OOVLBWMKs6PjA8lPuloWDNzSr3v76oUcHqAb+cfbucjXrOVsS9RJ0X9yxvCQyfM9FfY43DbspnN3izYhdvbJD8kKLNf0LA5st+ZxLfy0ACyL2iyAwICaqndqxAjQYplFAHmpUiu1DiHckyBPekokDJd+ze95urHMOsaGS5RWPoKJVE0bkaAeZCmEu0NNpXRSBiuxXSTeSAJfv6kyE/rkdhzUKyUl/cGQFrsVYfAFQVA+W6CKOh74ErSEzSHQQYndl7nD33snD/YqdU1ROxV6aJzLKCg+sdj+wRXSP2u/UHnM4jW9TGJfhO42jzL6WVuEvr9q4l7zWzUQKKKhtQ== +OVERLEAF_SAML_CERT=MIIDXTCCAkWgAwIBAgIJAOvOeQ4xFTzsMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMTE1MTQxMjU5WhcNMjYxMTE1MTQxMjU5WjBFMQswCQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCT6MBe5G9VoLU8MfztOEbUhnwLp17ak8eFUqxqeXkkqtWB0b/cmIBU3xoQoO3dIF8PBzfqehqfYVhrNt/TFgcmDfmJnPJRL1RJWMW3VmiP5odJ3LwlkKbZpkeT3wZ8HEJIR1+zbpxiBNkbd2GbdR1iumcsHzMYX1A2CBj+ZMV5VijC+K4P0e9c05VsDEUtLmfeAasJAiumQoVVgAe/BpiXjICGGewa6EPFI7mKkifIRKOGxdRESwZZjxP30bI31oDN0cgKqIgSJtJ9nfCn9jgBMBkQHu42WMuaWD4jrGd7+vYdX+oIfArs9aKgAH5kUGhGdew2R9SpBefrhbNxG8QIDAQABo1AwTjAdBgNVHQ4EFgQU+aSojSyyLChP/IpZcafvSdhj7KkwHwYDVR0jBBgwFoAU+aSojSyyLChP/IpZcafvSdhj7KkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABl3+OOVLBWMKs6PjA8lPuloWDNzSr3v76oUcHqAb+cfbucjXrOVsS9RJ0X9yxvCQyfM9FfY43DbspnN3izYhdvbJD8kKLNf0LA5st+ZxLfy0ACyL2iyAwICaqndqxAjQYplFAHmpUiu1DiHckyBPekokDJd+ze95urHMOsaGS5RWPoKJVE0bkaAeZCmEu0NNpXRSBiuxXSTeSAJfv6kyE/rkdhzUKyUl/cGQFrsVYfAFQVA+W6CKOh74ErSEzSHQQYndl7nD33snD/YqdU1ROxV6aJzLKCg+sdj+wRXSP2u/UHnM4jW9TGJfhO42jzL6WVuEvr9q4l7zWzUQKKKhtQ== # DEVICE_HISTORY_SECRET has been generated using: # NOTE: crypto.generateKeySync was added in v15, v16 is the next LTS release. # $ docker run --rm node:18.18.2 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")' diff --git a/services/web/local-dev.env b/services/web/local-dev.env index 038a77bf01..1a0fade42d 100644 --- a/services/web/local-dev.env +++ b/services/web/local-dev.env @@ -9,8 +9,8 @@ POSTGRES_HOST=127.0.0.1 MONGO_URL=mongodb://127.0.0.1/sharelatex?directConnection=true OVERLEAF_LDAP_URL=ldap://127.0.0.1:22389 SAML_BASE_URL_PATH=http://127.0.0.1:22280/simplesaml/ -SHARELATEX_SAML_ENTRYPOINT=http://127.0.0.1:22280/simplesaml/saml2/idp/SSOService.php -SHARELATEX_SAML_CALLBACK_URL=http://www.dev-overleaf.com/saml/callback +OVERLEAF_SAML_ENTRYPOINT=http://127.0.0.1:22280/simplesaml/saml2/idp/SSOService.php +OVERLEAF_SAML_CALLBACK_URL=http://www.dev-overleaf.com/saml/callback COOKIE_DOMAIN=.dev-overleaf.com PUBLIC_URL=https://www.dev-overleaf.com CURRENT_IMAGE_NAME=texlive-full:2021.1 diff --git a/services/web/local-test.env b/services/web/local-test.env index 1e29451d03..428915c58d 100644 --- a/services/web/local-test.env +++ b/services/web/local-test.env @@ -10,8 +10,8 @@ POSTGRES_HOST=127.0.0.1 MONGO_URL=mongodb://127.0.0.1/test-overleaf?directConnection=true OVERLEAF_LDAP_URL=ldap://127.0.0.1:22389 SAML_BASE_URL_PATH=http://127.0.0.1:22280/simplesaml/ -SHARELATEX_SAML_ENTRYPOINT=http://127.0.0.1:22280/simplesaml/saml2/idp/SSOService.php -SHARELATEX_SAML_CALLBACK_URL=http://127.0.0.1:22280/saml/callback +OVERLEAF_SAML_ENTRYPOINT=http://127.0.0.1:22280/simplesaml/saml2/idp/SSOService.php +OVERLEAF_SAML_CALLBACK_URL=http://127.0.0.1:22280/saml/callback COOKIE_DOMAIN= PUBLIC_URL=http://localhost:23000