Skip to content

Commit 3d01c99

Browse files
author
ngala
committed
Add auth-timeout flag in Gitlab Pages
Related to: https://gitlab.com/gitlab-org/gitlab-pages/-/issues/596 Changelog: added
1 parent 34fdcdd commit 3d01c99

File tree

4 files changed

+7
-0
lines changed

4 files changed

+7
-0
lines changed

files/gitlab-config-template/gitlab.rb.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,6 +1907,7 @@ external_url 'GENERATED_EXTERNAL_URL'
19071907
# gitlab_pages['internal_gitlab_server'] = nil # Defaults to gitlab_server, can be changed to internal load balancer
19081908
# gitlab_pages['auth_secret'] = nil # Generated if not present
19091909
# gitlab_pages['auth_scope'] = nil # Defaults to api, can be changed to read_api to increase security
1910+
# gitlab_pages['auth_timeout'] = "5s" # GitLab application client timeout for authentication
19101911
# gitlab_pages['auth_cookie_session_timeout'] = "10m" # Authentication cookie session timeout (truncated to seconds). A zero value means the cookie will be deleted after the browser session ends
19111912

19121913
##! GitLab Pages Server Shutdown Timeout

files/gitlab-cookbooks/gitlab-pages/attributes/default.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
default['gitlab_pages']['auth_redirect_uri'] = nil
3434
default['gitlab_pages']['auth_secret'] = nil
3535
default['gitlab_pages']['auth_scope'] = nil
36+
default['gitlab_pages']['auth_timeout'] = nil
3637
default['gitlab_pages']['auth_cookie_session_timeout'] = nil
3738
default['gitlab_pages']['insecure_ciphers'] = false
3839
default['gitlab_pages']['tls_min_version'] = nil

files/gitlab-cookbooks/gitlab-pages/templates/default/gitlab-pages-config.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ auth-secret=<%= @auth_secret %>
1717
<%- if @auth_scope -%>
1818
auth-scope=<%= @auth_scope %>
1919
<%- end -%>
20+
<%- if @auth_timeout -%>
21+
auth-timeout=<%= @auth_timeout %>
22+
<%- end -%>
2023
<%- if @auth_cookie_session_timeout -%>
2124
auth-cookie-session-timeout=<%= @auth_cookie_session_timeout %>
2225
<%- end -%>

spec/chef/cookbooks/gitlab-pages/recipes/gitlab-pages_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
auth_secret: 'auth_secret',
215215
auth_redirect_uri: 'https://projects.pages.example.com/auth',
216216
auth_scope: 'read_api',
217+
auth_timeout: '10s',
217218
auth_cookie_session_timeout: '20m',
218219
access_control: true,
219220
insecure_ciphers: true,
@@ -271,6 +272,7 @@
271272
auth-client-secret=app_secret
272273
auth-secret=auth_secret
273274
auth-scope=read_api
275+
auth-timeout=10s
274276
auth-cookie-session-timeout=20m
275277
zip-cache-expiration=120s
276278
zip-cache-cleanup=1m

0 commit comments

Comments
 (0)