From 2c816e616251062d879cd813e54a097f5dc94c0d Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 22 May 2021 18:56:38 +0200 Subject: [PATCH 1/2] providers/proxy: don't use https to communicate with outpost Signed-off-by: Jens Langhammer --- .../proxy/controllers/k8s/ingress.py | 5 +- web/src/locales/en.po | 102 +++++++++--------- web/src/locales/pseudo-LOCALE.po | 100 ++++++++--------- .../providers/proxy/ProxyProviderForm.ts | 2 +- 4 files changed, 104 insertions(+), 105 deletions(-) diff --git a/authentik/providers/proxy/controllers/k8s/ingress.py b/authentik/providers/proxy/controllers/k8s/ingress.py index f29c60023..bf0c588ab 100644 --- a/authentik/providers/proxy/controllers/k8s/ingress.py +++ b/authentik/providers/proxy/controllers/k8s/ingress.py @@ -84,7 +84,6 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]): "traefik.ingress.kubernetes.io/affinity": "true", "nginx.ingress.kubernetes.io/proxy-buffers-number": "4", "nginx.ingress.kubernetes.io/proxy-buffer-size": "16k", - "nginx.ingress.kubernetes.io/backend-protocol": "HTTPS", } annotations.update( self.controller.outpost.config.kubernetes_ingress_annotations @@ -114,7 +113,7 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]): NetworkingV1beta1HTTPIngressPath( backend=NetworkingV1beta1IngressBackend( service_name=self.name, - service_port="https", + service_port="http", ), path="/akprox", ) @@ -129,7 +128,7 @@ class IngressReconciler(KubernetesObjectReconciler[NetworkingV1beta1Ingress]): NetworkingV1beta1HTTPIngressPath( backend=NetworkingV1beta1IngressBackend( service_name=self.name, - service_port="https", + service_port="http", ), path="/", ) diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 9455e5099..ca74cde49 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -152,7 +152,7 @@ msgstr "Allow friends to authenticate via Plex, even if you don't share any serv msgid "Allow up to N occurrences in the HIBP database." msgstr "Allow up to N occurrences in the HIBP database." -#: src/pages/policies/PolicyListPage.ts:41 +#: src/pages/policies/PolicyListPage.ts:42 msgid "Allow users to use Applications based on properties, enforce Password Criteria and selectively apply Stages." msgstr "Allow users to use Applications based on properties, enforce Password Criteria and selectively apply Stages." @@ -218,7 +218,7 @@ msgstr "Applications" msgid "Apps with most usage" msgstr "Apps with most usage" -#: src/pages/flows/FlowListPage.ts:145 +#: src/pages/flows/FlowListPage.ts:146 msgid "" "Are you sure you want to clear the flow cache?\n" "This will cause all flows to be re-evaluated on their next usage." @@ -226,7 +226,7 @@ msgstr "" "Are you sure you want to clear the flow cache?\n" "This will cause all flows to be re-evaluated on their next usage." -#: src/pages/policies/PolicyListPage.ts:164 +#: src/pages/policies/PolicyListPage.ts:165 msgid "" "Are you sure you want to clear the policy cache?\n" "This will cause all policies to be re-evaluated on their next usage." @@ -266,7 +266,7 @@ msgstr "Assertions is empty" msgid "Assigned to application" msgstr "Assigned to application" -#: src/pages/policies/PolicyListPage.ts:68 +#: src/pages/policies/PolicyListPage.ts:69 msgid "Assigned to {0} objects." msgstr "Assigned to {0} objects." @@ -546,18 +546,18 @@ msgstr "Checks if the request's user's password has been changed in the last x d msgid "Checks the value from the policy request against several rules, mostly used to ensure password strength." msgstr "Checks the value from the policy request against several rules, mostly used to ensure password strength." -#: src/pages/flows/FlowListPage.ts:142 +#: src/pages/flows/FlowListPage.ts:143 msgid "Clear Flow cache" msgstr "Clear Flow cache" -#: src/pages/policies/PolicyListPage.ts:161 +#: src/pages/policies/PolicyListPage.ts:162 msgid "Clear Policy cache" msgstr "Clear Policy cache" -#: src/pages/flows/FlowListPage.ts:137 -#: src/pages/flows/FlowListPage.ts:149 -#: src/pages/policies/PolicyListPage.ts:156 -#: src/pages/policies/PolicyListPage.ts:168 +#: src/pages/flows/FlowListPage.ts:138 +#: src/pages/flows/FlowListPage.ts:150 +#: src/pages/policies/PolicyListPage.ts:157 +#: src/pages/policies/PolicyListPage.ts:169 msgid "Clear cache" msgstr "Clear cache" @@ -757,8 +757,8 @@ msgstr "Copy download URL" #: src/pages/flows/BoundStagesList.ts:119 #: src/pages/flows/BoundStagesList.ts:146 #: src/pages/flows/BoundStagesList.ts:167 -#: src/pages/flows/FlowListPage.ts:109 -#: src/pages/flows/FlowListPage.ts:117 +#: src/pages/flows/FlowListPage.ts:110 +#: src/pages/flows/FlowListPage.ts:118 #: src/pages/groups/GroupListPage.ts:90 #: src/pages/groups/GroupListPage.ts:98 #: src/pages/outposts/OutpostListPage.ts:101 @@ -768,8 +768,8 @@ msgstr "Copy download URL" #: src/pages/policies/BoundPoliciesList.ts:162 #: src/pages/policies/BoundPoliciesList.ts:189 #: src/pages/policies/BoundPoliciesList.ts:210 -#: src/pages/policies/PolicyListPage.ts:124 -#: src/pages/policies/PolicyListPage.ts:133 +#: src/pages/policies/PolicyListPage.ts:125 +#: src/pages/policies/PolicyListPage.ts:134 #: src/pages/property-mappings/PropertyMappingListPage.ts:113 #: src/pages/property-mappings/PropertyMappingListPage.ts:122 #: src/pages/providers/ProviderListPage.ts:108 @@ -809,7 +809,7 @@ msgstr "Create Binding" msgid "Create Certificate-Key Pair" msgstr "Create Certificate-Key Pair" -#: src/pages/flows/FlowListPage.ts:112 +#: src/pages/flows/FlowListPage.ts:113 msgid "Create Flow" msgstr "Create Flow" @@ -871,7 +871,7 @@ msgstr "Create provider" #: src/pages/flows/BoundStagesList.ts:149 #: src/pages/outposts/ServiceConnectionListPage.ts:122 #: src/pages/policies/BoundPoliciesList.ts:192 -#: src/pages/policies/PolicyListPage.ts:136 +#: src/pages/policies/PolicyListPage.ts:137 #: src/pages/property-mappings/PropertyMappingListPage.ts:125 #: src/pages/providers/ProviderListPage.ts:120 #: src/pages/sources/SourcesListPage.ts:126 @@ -923,11 +923,11 @@ msgstr "Define how notifications are sent to users, like Email or Webhook." #: src/pages/crypto/CertificateKeyPairListPage.ts:86 #: src/pages/events/RuleListPage.ts:82 #: src/pages/events/TransportListPage.ts:86 -#: src/pages/flows/FlowListPage.ts:86 +#: src/pages/flows/FlowListPage.ts:87 #: src/pages/groups/GroupListPage.ts:81 #: src/pages/outposts/OutpostListPage.ts:87 #: src/pages/outposts/ServiceConnectionListPage.ts:101 -#: src/pages/policies/PolicyListPage.ts:115 +#: src/pages/policies/PolicyListPage.ts:116 #: src/pages/property-mappings/PropertyMappingListPage.ts:104 #: src/pages/providers/ProviderListPage.ts:99 #: src/pages/sources/SourcesListPage.ts:95 @@ -998,7 +998,7 @@ msgid "Designates whether this user should be treated as active. Unselect this i msgstr "Designates whether this user should be treated as active. Unselect this instead of deleting accounts." #: src/pages/flows/FlowForm.ts:119 -#: src/pages/flows/FlowListPage.ts:48 +#: src/pages/flows/FlowListPage.ts:49 msgid "Designation" msgstr "Designation" @@ -1080,11 +1080,11 @@ msgstr "Each provider has a different issuer, based on the application slug." #: src/pages/crypto/CertificateKeyPairListPage.ts:74 #: src/pages/events/RuleListPage.ts:70 #: src/pages/events/TransportListPage.ts:74 -#: src/pages/flows/FlowListPage.ts:74 +#: src/pages/flows/FlowListPage.ts:75 #: src/pages/groups/GroupListPage.ts:69 #: src/pages/outposts/OutpostListPage.ts:75 #: src/pages/outposts/ServiceConnectionListPage.ts:89 -#: src/pages/policies/PolicyListPage.ts:90 +#: src/pages/policies/PolicyListPage.ts:91 #: src/pages/property-mappings/PropertyMappingListPage.ts:79 #: src/pages/providers/ProviderListPage.ts:87 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:103 @@ -1256,7 +1256,7 @@ msgstr "Events" msgid "Exception" msgstr "Exception" -#: src/pages/flows/FlowListPage.ts:98 +#: src/pages/flows/FlowListPage.ts:99 #: src/pages/flows/FlowViewPage.ts:75 msgid "Execute" msgstr "Execute" @@ -1308,7 +1308,7 @@ msgstr "Expiry date" msgid "Explicit Consent" msgstr "Explicit Consent" -#: src/pages/flows/FlowListPage.ts:101 +#: src/pages/flows/FlowListPage.ts:102 msgid "Export" msgstr "Export" @@ -1347,11 +1347,11 @@ msgstr "Failed attempts before cancel" msgid "Failed sources" msgstr "Failed sources" -#: src/pages/flows/FlowListPage.ts:136 +#: src/pages/flows/FlowListPage.ts:137 msgid "Failed to delete flow cache" msgstr "Failed to delete flow cache" -#: src/pages/policies/PolicyListPage.ts:155 +#: src/pages/policies/PolicyListPage.ts:156 msgid "Failed to delete policy cache" msgstr "Failed to delete policy cache" @@ -1397,7 +1397,7 @@ msgid "Fields a user can identify themselves with. If no fields are selected, th msgstr "Fields a user can identify themselves with. If no fields are selected, the user will only be able to use sources." #: src/pages/flows/FlowImportForm.ts:34 -#: src/pages/flows/FlowListPage.ts:79 +#: src/pages/flows/FlowListPage.ts:80 msgid "Flow" msgstr "Flow" @@ -1450,12 +1450,12 @@ msgstr "Flow used when authorizing this provider." #: src/interfaces/AdminInterface.ts:82 #: src/interfaces/AdminInterface.ts:84 #: src/pages/admin-overview/AdminOverviewPage.ts:61 -#: src/pages/flows/FlowListPage.ts:28 +#: src/pages/flows/FlowListPage.ts:29 #: src/pages/stages/StageListPage.ts:66 msgid "Flows" msgstr "Flows" -#: src/pages/flows/FlowListPage.ts:31 +#: src/pages/flows/FlowListPage.ts:32 msgid "Flows describe a chain of Stages to authenticate, enroll or recover a user. Stages are chosen based on policies applied to them." msgstr "Flows describe a chain of Stages to authenticate, enroll or recover a user. Stages are chosen based on policies applied to them." @@ -1606,7 +1606,7 @@ msgstr "ID" msgid "Icon" msgstr "Icon" -#: src/pages/flows/FlowListPage.ts:46 +#: src/pages/flows/FlowListPage.ts:47 #: src/pages/system-tasks/SystemTaskListPage.ts:54 #: src/pages/tokens/TokenListPage.ts:44 #: src/pages/user-settings/tokens/UserTokenForm.ts:49 @@ -1639,12 +1639,12 @@ msgstr "If your authentik Instance is using a self-signed certificate, set this msgid "Impersonate" msgstr "Impersonate" -#: src/pages/flows/FlowListPage.ts:122 -#: src/pages/flows/FlowListPage.ts:130 +#: src/pages/flows/FlowListPage.ts:123 +#: src/pages/flows/FlowListPage.ts:131 msgid "Import" msgstr "Import" -#: src/pages/flows/FlowListPage.ts:125 +#: src/pages/flows/FlowListPage.ts:126 msgid "Import Flow" msgstr "Import Flow" @@ -2000,7 +2000,7 @@ msgstr "My Applications" #: src/pages/events/TransportListPage.ts:46 #: src/pages/flows/BoundStagesList.ts:39 #: src/pages/flows/FlowForm.ts:86 -#: src/pages/flows/FlowListPage.ts:47 +#: src/pages/flows/FlowListPage.ts:48 #: src/pages/groups/GroupForm.ts:58 #: src/pages/groups/GroupListPage.ts:45 #: src/pages/groups/MemberSelectModal.ts:45 @@ -2009,7 +2009,7 @@ msgstr "My Applications" #: src/pages/outposts/ServiceConnectionDockerForm.ts:51 #: src/pages/outposts/ServiceConnectionKubernetesForm.ts:52 #: src/pages/outposts/ServiceConnectionListPage.ts:53 -#: src/pages/policies/PolicyListPage.ts:56 +#: src/pages/policies/PolicyListPage.ts:57 #: src/pages/policies/dummy/DummyPolicyForm.ts:54 #: src/pages/policies/event_matcher/EventMatcherPolicyForm.ts:55 #: src/pages/policies/expiry/ExpiryPolicyForm.ts:54 @@ -2398,15 +2398,15 @@ msgstr "Please enter your password" #: src/interfaces/AdminInterface.ts:74 #: src/pages/admin-overview/AdminOverviewPage.ts:56 -#: src/pages/flows/FlowListPage.ts:50 -#: src/pages/policies/PolicyListPage.ts:38 +#: src/pages/flows/FlowListPage.ts:51 +#: src/pages/policies/PolicyListPage.ts:39 msgid "Policies" msgstr "Policies" #: src/pages/policies/PolicyBindingForm.ts:108 #: src/pages/policies/PolicyBindingForm.ts:117 #: src/pages/policies/PolicyBindingForm.ts:148 -#: src/pages/policies/PolicyListPage.ts:108 +#: src/pages/policies/PolicyListPage.ts:109 msgid "Policy" msgstr "Policy" @@ -3056,7 +3056,7 @@ msgid "Stage-specific settings" msgstr "Stage-specific settings" #: src/interfaces/AdminInterface.ts:87 -#: src/pages/flows/FlowListPage.ts:49 +#: src/pages/flows/FlowListPage.ts:50 #: src/pages/stages/StageListPage.ts:44 #: src/pages/stages/prompt/PromptListPage.ts:50 msgid "Stages" @@ -3120,11 +3120,11 @@ msgstr "Subject-alt name" msgid "Successful" msgstr "Successful" -#: src/pages/flows/FlowListPage.ts:135 +#: src/pages/flows/FlowListPage.ts:136 msgid "Successfully cleared flow cache" msgstr "Successfully cleared flow cache" -#: src/pages/policies/PolicyListPage.ts:154 +#: src/pages/policies/PolicyListPage.ts:155 msgid "Successfully cleared policy cache" msgstr "Successfully cleared policy cache" @@ -3452,14 +3452,14 @@ msgid "Template" msgstr "Template" #: src/pages/events/TransportListPage.ts:62 -#: src/pages/policies/PolicyListPage.ts:95 -#: src/pages/policies/PolicyListPage.ts:103 +#: src/pages/policies/PolicyListPage.ts:96 +#: src/pages/policies/PolicyListPage.ts:104 #: src/pages/property-mappings/PropertyMappingListPage.ts:84 #: src/pages/property-mappings/PropertyMappingListPage.ts:92 msgid "Test" msgstr "Test" -#: src/pages/policies/PolicyListPage.ts:98 +#: src/pages/policies/PolicyListPage.ts:99 msgid "Test Policy" msgstr "Test Policy" @@ -3476,8 +3476,8 @@ msgid "The URL \"{0}\" was not found." msgstr "The URL \"{0}\" was not found." #: src/pages/providers/proxy/ProxyProviderForm.ts:131 -msgid "The external URL you'll access the application at" -msgstr "The external URL you'll access the application at" +msgid "The external URL you'll access the application at. Include any non-standard port." +msgstr "The external URL you'll access the application at. Include any non-standard port." #: src/pages/policies/dummy/DummyPolicyForm.ts:88 msgid "The policy takes a random time to execute. This controls the minimum time it will take." @@ -3611,7 +3611,7 @@ msgstr "Transports" #: src/pages/flows/BoundStagesList.ts:40 #: src/pages/outposts/OutpostForm.ts:58 #: src/pages/outposts/ServiceConnectionListPage.ts:54 -#: src/pages/policies/PolicyListPage.ts:57 +#: src/pages/policies/PolicyListPage.ts:58 #: src/pages/property-mappings/PropertyMappingListPage.ts:55 #: src/pages/providers/ProviderListPage.ts:55 #: src/pages/sources/SourcesListPage.ts:53 @@ -3687,7 +3687,7 @@ msgstr "Up-to-date!" #: src/pages/events/TransportListPage.ts:66 #: src/pages/flows/BoundStagesList.ts:53 #: src/pages/flows/BoundStagesList.ts:71 -#: src/pages/flows/FlowListPage.ts:66 +#: src/pages/flows/FlowListPage.ts:67 #: src/pages/groups/GroupListPage.ts:61 #: src/pages/outposts/OutpostListPage.ts:67 #: src/pages/outposts/ServiceConnectionListPage.ts:76 @@ -3695,7 +3695,7 @@ msgstr "Up-to-date!" #: src/pages/policies/BoundPoliciesList.ts:88 #: src/pages/policies/BoundPoliciesList.ts:103 #: src/pages/policies/BoundPoliciesList.ts:129 -#: src/pages/policies/PolicyListPage.ts:77 +#: src/pages/policies/PolicyListPage.ts:78 #: src/pages/property-mappings/PropertyMappingListPage.ts:66 #: src/pages/providers/ProviderListPage.ts:74 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:93 @@ -3733,7 +3733,7 @@ msgstr "Update Binding" msgid "Update Certificate-Key Pair" msgstr "Update Certificate-Key Pair" -#: src/pages/flows/FlowListPage.ts:69 +#: src/pages/flows/FlowListPage.ts:70 msgid "Update Flow" msgstr "Update Flow" @@ -3811,7 +3811,7 @@ msgstr "Update details" #: src/pages/flows/BoundStagesList.ts:56 #: src/pages/outposts/ServiceConnectionListPage.ts:79 #: src/pages/policies/BoundPoliciesList.ts:71 -#: src/pages/policies/PolicyListPage.ts:80 +#: src/pages/policies/PolicyListPage.ts:81 #: src/pages/property-mappings/PropertyMappingListPage.ts:69 #: src/pages/providers/ProviderListPage.ts:77 #: src/pages/sources/SourcesListPage.ts:73 @@ -4032,7 +4032,7 @@ msgstr "Wait (min)" msgid "Warning" msgstr "Warning" -#: src/pages/policies/PolicyListPage.ts:71 +#: src/pages/policies/PolicyListPage.ts:72 msgid "Warning: Policy is not assigned." msgstr "Warning: Policy is not assigned." diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 19620c066..cada4bf31 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -152,7 +152,7 @@ msgstr "" msgid "Allow up to N occurrences in the HIBP database." msgstr "" -#: src/pages/policies/PolicyListPage.ts:41 +#: src/pages/policies/PolicyListPage.ts:42 msgid "Allow users to use Applications based on properties, enforce Password Criteria and selectively apply Stages." msgstr "" @@ -218,13 +218,13 @@ msgstr "" msgid "Apps with most usage" msgstr "" -#: src/pages/flows/FlowListPage.ts:145 +#: src/pages/flows/FlowListPage.ts:146 msgid "" "Are you sure you want to clear the flow cache?\n" "This will cause all flows to be re-evaluated on their next usage." msgstr "" -#: src/pages/policies/PolicyListPage.ts:164 +#: src/pages/policies/PolicyListPage.ts:165 msgid "" "Are you sure you want to clear the policy cache?\n" "This will cause all policies to be re-evaluated on their next usage." @@ -262,7 +262,7 @@ msgstr "" msgid "Assigned to application" msgstr "" -#: src/pages/policies/PolicyListPage.ts:68 +#: src/pages/policies/PolicyListPage.ts:69 msgid "Assigned to {0} objects." msgstr "" @@ -540,18 +540,18 @@ msgstr "" msgid "Checks the value from the policy request against several rules, mostly used to ensure password strength." msgstr "" -#: src/pages/flows/FlowListPage.ts:142 +#: src/pages/flows/FlowListPage.ts:143 msgid "Clear Flow cache" msgstr "" -#: src/pages/policies/PolicyListPage.ts:161 +#: src/pages/policies/PolicyListPage.ts:162 msgid "Clear Policy cache" msgstr "" -#: src/pages/flows/FlowListPage.ts:137 -#: src/pages/flows/FlowListPage.ts:149 -#: src/pages/policies/PolicyListPage.ts:156 -#: src/pages/policies/PolicyListPage.ts:168 +#: src/pages/flows/FlowListPage.ts:138 +#: src/pages/flows/FlowListPage.ts:150 +#: src/pages/policies/PolicyListPage.ts:157 +#: src/pages/policies/PolicyListPage.ts:169 msgid "Clear cache" msgstr "" @@ -751,8 +751,8 @@ msgstr "" #: src/pages/flows/BoundStagesList.ts:119 #: src/pages/flows/BoundStagesList.ts:146 #: src/pages/flows/BoundStagesList.ts:167 -#: src/pages/flows/FlowListPage.ts:109 -#: src/pages/flows/FlowListPage.ts:117 +#: src/pages/flows/FlowListPage.ts:110 +#: src/pages/flows/FlowListPage.ts:118 #: src/pages/groups/GroupListPage.ts:90 #: src/pages/groups/GroupListPage.ts:98 #: src/pages/outposts/OutpostListPage.ts:101 @@ -762,8 +762,8 @@ msgstr "" #: src/pages/policies/BoundPoliciesList.ts:162 #: src/pages/policies/BoundPoliciesList.ts:189 #: src/pages/policies/BoundPoliciesList.ts:210 -#: src/pages/policies/PolicyListPage.ts:124 -#: src/pages/policies/PolicyListPage.ts:133 +#: src/pages/policies/PolicyListPage.ts:125 +#: src/pages/policies/PolicyListPage.ts:134 #: src/pages/property-mappings/PropertyMappingListPage.ts:113 #: src/pages/property-mappings/PropertyMappingListPage.ts:122 #: src/pages/providers/ProviderListPage.ts:108 @@ -803,7 +803,7 @@ msgstr "" msgid "Create Certificate-Key Pair" msgstr "" -#: src/pages/flows/FlowListPage.ts:112 +#: src/pages/flows/FlowListPage.ts:113 msgid "Create Flow" msgstr "" @@ -865,7 +865,7 @@ msgstr "" #: src/pages/flows/BoundStagesList.ts:149 #: src/pages/outposts/ServiceConnectionListPage.ts:122 #: src/pages/policies/BoundPoliciesList.ts:192 -#: src/pages/policies/PolicyListPage.ts:136 +#: src/pages/policies/PolicyListPage.ts:137 #: src/pages/property-mappings/PropertyMappingListPage.ts:125 #: src/pages/providers/ProviderListPage.ts:120 #: src/pages/sources/SourcesListPage.ts:126 @@ -917,11 +917,11 @@ msgstr "" #: src/pages/crypto/CertificateKeyPairListPage.ts:86 #: src/pages/events/RuleListPage.ts:82 #: src/pages/events/TransportListPage.ts:86 -#: src/pages/flows/FlowListPage.ts:86 +#: src/pages/flows/FlowListPage.ts:87 #: src/pages/groups/GroupListPage.ts:81 #: src/pages/outposts/OutpostListPage.ts:87 #: src/pages/outposts/ServiceConnectionListPage.ts:101 -#: src/pages/policies/PolicyListPage.ts:115 +#: src/pages/policies/PolicyListPage.ts:116 #: src/pages/property-mappings/PropertyMappingListPage.ts:104 #: src/pages/providers/ProviderListPage.ts:99 #: src/pages/sources/SourcesListPage.ts:95 @@ -990,7 +990,7 @@ msgid "Designates whether this user should be treated as active. Unselect this i msgstr "" #: src/pages/flows/FlowForm.ts:119 -#: src/pages/flows/FlowListPage.ts:48 +#: src/pages/flows/FlowListPage.ts:49 msgid "Designation" msgstr "" @@ -1072,11 +1072,11 @@ msgstr "" #: src/pages/crypto/CertificateKeyPairListPage.ts:74 #: src/pages/events/RuleListPage.ts:70 #: src/pages/events/TransportListPage.ts:74 -#: src/pages/flows/FlowListPage.ts:74 +#: src/pages/flows/FlowListPage.ts:75 #: src/pages/groups/GroupListPage.ts:69 #: src/pages/outposts/OutpostListPage.ts:75 #: src/pages/outposts/ServiceConnectionListPage.ts:89 -#: src/pages/policies/PolicyListPage.ts:90 +#: src/pages/policies/PolicyListPage.ts:91 #: src/pages/property-mappings/PropertyMappingListPage.ts:79 #: src/pages/providers/ProviderListPage.ts:87 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:103 @@ -1248,7 +1248,7 @@ msgstr "" msgid "Exception" msgstr "" -#: src/pages/flows/FlowListPage.ts:98 +#: src/pages/flows/FlowListPage.ts:99 #: src/pages/flows/FlowViewPage.ts:75 msgid "Execute" msgstr "" @@ -1300,7 +1300,7 @@ msgstr "" msgid "Explicit Consent" msgstr "" -#: src/pages/flows/FlowListPage.ts:101 +#: src/pages/flows/FlowListPage.ts:102 msgid "Export" msgstr "" @@ -1339,11 +1339,11 @@ msgstr "" msgid "Failed sources" msgstr "" -#: src/pages/flows/FlowListPage.ts:136 +#: src/pages/flows/FlowListPage.ts:137 msgid "Failed to delete flow cache" msgstr "" -#: src/pages/policies/PolicyListPage.ts:155 +#: src/pages/policies/PolicyListPage.ts:156 msgid "Failed to delete policy cache" msgstr "" @@ -1389,7 +1389,7 @@ msgid "Fields a user can identify themselves with. If no fields are selected, th msgstr "" #: src/pages/flows/FlowImportForm.ts:34 -#: src/pages/flows/FlowListPage.ts:79 +#: src/pages/flows/FlowListPage.ts:80 msgid "Flow" msgstr "" @@ -1442,12 +1442,12 @@ msgstr "" #: src/interfaces/AdminInterface.ts:82 #: src/interfaces/AdminInterface.ts:84 #: src/pages/admin-overview/AdminOverviewPage.ts:61 -#: src/pages/flows/FlowListPage.ts:28 +#: src/pages/flows/FlowListPage.ts:29 #: src/pages/stages/StageListPage.ts:66 msgid "Flows" msgstr "" -#: src/pages/flows/FlowListPage.ts:31 +#: src/pages/flows/FlowListPage.ts:32 msgid "Flows describe a chain of Stages to authenticate, enroll or recover a user. Stages are chosen based on policies applied to them." msgstr "" @@ -1598,7 +1598,7 @@ msgstr "" msgid "Icon" msgstr "" -#: src/pages/flows/FlowListPage.ts:46 +#: src/pages/flows/FlowListPage.ts:47 #: src/pages/system-tasks/SystemTaskListPage.ts:54 #: src/pages/tokens/TokenListPage.ts:44 #: src/pages/user-settings/tokens/UserTokenForm.ts:49 @@ -1631,12 +1631,12 @@ msgstr "" msgid "Impersonate" msgstr "" -#: src/pages/flows/FlowListPage.ts:122 -#: src/pages/flows/FlowListPage.ts:130 +#: src/pages/flows/FlowListPage.ts:123 +#: src/pages/flows/FlowListPage.ts:131 msgid "Import" msgstr "" -#: src/pages/flows/FlowListPage.ts:125 +#: src/pages/flows/FlowListPage.ts:126 msgid "Import Flow" msgstr "" @@ -1992,7 +1992,7 @@ msgstr "" #: src/pages/events/TransportListPage.ts:46 #: src/pages/flows/BoundStagesList.ts:39 #: src/pages/flows/FlowForm.ts:86 -#: src/pages/flows/FlowListPage.ts:47 +#: src/pages/flows/FlowListPage.ts:48 #: src/pages/groups/GroupForm.ts:58 #: src/pages/groups/GroupListPage.ts:45 #: src/pages/groups/MemberSelectModal.ts:45 @@ -2001,7 +2001,7 @@ msgstr "" #: src/pages/outposts/ServiceConnectionDockerForm.ts:51 #: src/pages/outposts/ServiceConnectionKubernetesForm.ts:52 #: src/pages/outposts/ServiceConnectionListPage.ts:53 -#: src/pages/policies/PolicyListPage.ts:56 +#: src/pages/policies/PolicyListPage.ts:57 #: src/pages/policies/dummy/DummyPolicyForm.ts:54 #: src/pages/policies/event_matcher/EventMatcherPolicyForm.ts:55 #: src/pages/policies/expiry/ExpiryPolicyForm.ts:54 @@ -2390,15 +2390,15 @@ msgstr "" #: src/interfaces/AdminInterface.ts:74 #: src/pages/admin-overview/AdminOverviewPage.ts:56 -#: src/pages/flows/FlowListPage.ts:50 -#: src/pages/policies/PolicyListPage.ts:38 +#: src/pages/flows/FlowListPage.ts:51 +#: src/pages/policies/PolicyListPage.ts:39 msgid "Policies" msgstr "" #: src/pages/policies/PolicyBindingForm.ts:108 #: src/pages/policies/PolicyBindingForm.ts:117 #: src/pages/policies/PolicyBindingForm.ts:148 -#: src/pages/policies/PolicyListPage.ts:108 +#: src/pages/policies/PolicyListPage.ts:109 msgid "Policy" msgstr "" @@ -3048,7 +3048,7 @@ msgid "Stage-specific settings" msgstr "" #: src/interfaces/AdminInterface.ts:87 -#: src/pages/flows/FlowListPage.ts:49 +#: src/pages/flows/FlowListPage.ts:50 #: src/pages/stages/StageListPage.ts:44 #: src/pages/stages/prompt/PromptListPage.ts:50 msgid "Stages" @@ -3112,11 +3112,11 @@ msgstr "" msgid "Successful" msgstr "" -#: src/pages/flows/FlowListPage.ts:135 +#: src/pages/flows/FlowListPage.ts:136 msgid "Successfully cleared flow cache" msgstr "" -#: src/pages/policies/PolicyListPage.ts:154 +#: src/pages/policies/PolicyListPage.ts:155 msgid "Successfully cleared policy cache" msgstr "" @@ -3444,14 +3444,14 @@ msgid "Template" msgstr "" #: src/pages/events/TransportListPage.ts:62 -#: src/pages/policies/PolicyListPage.ts:95 -#: src/pages/policies/PolicyListPage.ts:103 +#: src/pages/policies/PolicyListPage.ts:96 +#: src/pages/policies/PolicyListPage.ts:104 #: src/pages/property-mappings/PropertyMappingListPage.ts:84 #: src/pages/property-mappings/PropertyMappingListPage.ts:92 msgid "Test" msgstr "" -#: src/pages/policies/PolicyListPage.ts:98 +#: src/pages/policies/PolicyListPage.ts:99 msgid "Test Policy" msgstr "" @@ -3468,7 +3468,7 @@ msgid "The URL \"{0}\" was not found." msgstr "" #: src/pages/providers/proxy/ProxyProviderForm.ts:131 -msgid "The external URL you'll access the application at" +msgid "The external URL you'll access the application at. Include any non-standard port." msgstr "" #: src/pages/policies/dummy/DummyPolicyForm.ts:88 @@ -3599,7 +3599,7 @@ msgstr "" #: src/pages/flows/BoundStagesList.ts:40 #: src/pages/outposts/OutpostForm.ts:58 #: src/pages/outposts/ServiceConnectionListPage.ts:54 -#: src/pages/policies/PolicyListPage.ts:57 +#: src/pages/policies/PolicyListPage.ts:58 #: src/pages/property-mappings/PropertyMappingListPage.ts:55 #: src/pages/providers/ProviderListPage.ts:55 #: src/pages/sources/SourcesListPage.ts:53 @@ -3675,7 +3675,7 @@ msgstr "" #: src/pages/events/TransportListPage.ts:66 #: src/pages/flows/BoundStagesList.ts:53 #: src/pages/flows/BoundStagesList.ts:71 -#: src/pages/flows/FlowListPage.ts:66 +#: src/pages/flows/FlowListPage.ts:67 #: src/pages/groups/GroupListPage.ts:61 #: src/pages/outposts/OutpostListPage.ts:67 #: src/pages/outposts/ServiceConnectionListPage.ts:76 @@ -3683,7 +3683,7 @@ msgstr "" #: src/pages/policies/BoundPoliciesList.ts:88 #: src/pages/policies/BoundPoliciesList.ts:103 #: src/pages/policies/BoundPoliciesList.ts:129 -#: src/pages/policies/PolicyListPage.ts:77 +#: src/pages/policies/PolicyListPage.ts:78 #: src/pages/property-mappings/PropertyMappingListPage.ts:66 #: src/pages/providers/ProviderListPage.ts:74 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:93 @@ -3721,7 +3721,7 @@ msgstr "" msgid "Update Certificate-Key Pair" msgstr "" -#: src/pages/flows/FlowListPage.ts:69 +#: src/pages/flows/FlowListPage.ts:70 msgid "Update Flow" msgstr "" @@ -3799,7 +3799,7 @@ msgstr "" #: src/pages/flows/BoundStagesList.ts:56 #: src/pages/outposts/ServiceConnectionListPage.ts:79 #: src/pages/policies/BoundPoliciesList.ts:71 -#: src/pages/policies/PolicyListPage.ts:80 +#: src/pages/policies/PolicyListPage.ts:81 #: src/pages/property-mappings/PropertyMappingListPage.ts:69 #: src/pages/providers/ProviderListPage.ts:77 #: src/pages/sources/SourcesListPage.ts:73 @@ -4020,7 +4020,7 @@ msgstr "" msgid "Warning" msgstr "" -#: src/pages/policies/PolicyListPage.ts:71 +#: src/pages/policies/PolicyListPage.ts:72 msgid "Warning: Policy is not assigned." msgstr "" diff --git a/web/src/pages/providers/proxy/ProxyProviderForm.ts b/web/src/pages/providers/proxy/ProxyProviderForm.ts index adb3412bb..4a5c3719c 100644 --- a/web/src/pages/providers/proxy/ProxyProviderForm.ts +++ b/web/src/pages/providers/proxy/ProxyProviderForm.ts @@ -125,7 +125,7 @@ export class ProxyProviderFormPage extends ModelForm { ?required=${true} name="externalHost"> -

${t`The external URL you'll access the application at`}

+

${t`The external URL you'll access the application at. Include any non-standard port.`}

From 9d476a42d14964b2675d8621df827d3cf6642dba Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 22 May 2021 19:46:40 +0200 Subject: [PATCH 2/2] web: don't set X-Forwarded-Proto when no request TLS Options are set Signed-off-by: Jens Langhammer --- internal/web/web_proxy.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/web/web_proxy.go b/internal/web/web_proxy.go index b4cb13d20..2eb7f7ab9 100644 --- a/internal/web/web_proxy.go +++ b/internal/web/web_proxy.go @@ -18,8 +18,6 @@ func (ws *WebServer) configureProxy() { } if req.TLS != nil { req.Header.Set("X-Forwarded-Proto", "https") - } else { - req.Header.Set("X-Forwarded-Proto", "http") } } rp := &httputil.ReverseProxy{Director: director}