Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
56933f2f
Commit
56933f2f
authored
Feb 23, 2021
by
Robert May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an ops feature flag for cert loading
parent
d763b981
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
lib/gitlab/x509/signature.rb
lib/gitlab/x509/signature.rb
+4
-2
No files found.
lib/gitlab/x509/signature.rb
View file @
56933f2f
...
...
@@ -53,8 +53,10 @@ module Gitlab
store
=
OpenSSL
::
X509
::
Store
.
new
store
.
set_default_paths
# Forcibly load the default cert file because the OpenSSL library seemingly ignores it
store
.
add_file
(
OpenSSL
::
X509
::
DEFAULT_CERT_FILE
)
if
File
.
exist?
(
OpenSSL
::
X509
::
DEFAULT_CERT_FILE
)
if
Feature
.
enabled?
(
:x509_forced_cert_loading
,
type: :ops
)
# Forcibly load the default cert file because the OpenSSL library seemingly ignores it
store
.
add_file
(
OpenSSL
::
X509
::
DEFAULT_CERT_FILE
)
if
File
.
exist?
(
OpenSSL
::
X509
::
DEFAULT_CERT_FILE
)
end
# valid_signing_time? checks the time attributes already
# this flag is required, otherwise expired certificates would become
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment