Skip to content

Support SSL verification via internal CA bundle #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpocentek merged 1 commit into from
Aug 5, 2017
Merged

Support SSL verification via internal CA bundle #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions docs/cli.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ parameters. You can override the values in each GitLab server section.
- Possible values
- Description
* - ``ssl_verify``
- ``True`` or ``False``
- Verify the SSL certificate. Set to ``False`` if your SSL certificate is
auto-signed.
- ``True``, ``False``, or a ``str``
- Verify the SSL certificate. Set to ``False`` to disable verification,
though this will create warnings. Any other value is interpreted as path
to a CA_BUNDLE file or directory with certificates of trusted CAs.
* - ``timeout``
- Integer
- Number of seconds to wait for an answer before failing.
Expand Down
17 changes: 17 additions & 0 deletions gitlab/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,28 @@ def __init__(self, gitlab_id=None, config_files=None):
self.ssl_verify = True
try:
self.ssl_verify = self._config.getboolean('global', 'ssl_verify')
except ValueError:
# Value Error means the option exists but isn't a boolean.
# Get as a string instead as it should then be a local path to a
# CA bundle.
try:
self.ssl_verify = self._config.get('global', 'ssl_verify')
except Exception:
pass
except Exception:
pass
try:
self.ssl_verify = self._config.getboolean(self.gitlab_id,
'ssl_verify')
except ValueError:
# Value Error means the option exists but isn't a boolean.
# Get as a string instead as it should then be a local path to a
# CA bundle.
try:
self.ssl_verify = self._config.get(self.gitlab_id,
'ssl_verify')
except Exception:
pass
except Exception:
pass

Expand Down
15 changes: 15 additions & 0 deletions gitlab/tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
private_token = GHIJKL
ssl_verify = false
timeout = 10

[three]
url = https://three.url
private_token = MNOPQR
ssl_verify = /path/to/CA/bundle.crt
"""

no_default_config = u"""[global]
Expand Down Expand Up @@ -109,3 +114,13 @@ def test_valid_data(self, m_open):
self.assertEqual("GHIJKL", cp.token)
self.assertEqual(10, cp.timeout)
self.assertEqual(False, cp.ssl_verify)

fd = six.StringIO(valid_config)
fd.close = mock.Mock(return_value=None)
m_open.return_value = fd
cp = config.GitlabConfigParser(gitlab_id="three")
self.assertEqual("three", cp.gitlab_id)
self.assertEqual("https://three.url", cp.url)
self.assertEqual("MNOPQR", cp.token)
self.assertEqual(2, cp.timeout)
self.assertEqual("/path/to/CA/bundle.crt", cp.ssl_verify)