-
Notifications
You must be signed in to change notification settings - Fork 25
New option to ignore ssl verification of Jenkins server #27
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.
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
Open
bernardoVale
wants to merge
2
commits into
LD250:master
Choose a base branch
from
bernardoVale:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| import sys | ||
| import datetime | ||
| from time import time, sleep | ||
| import ssl | ||
| import jenkins | ||
| import socket | ||
| from xml.etree import ElementTree | ||
|
|
@@ -31,6 +32,11 @@ | |
| } | ||
|
|
||
|
|
||
| # Default constants to parse booleans from .jenkins-cli | ||
| TRUE = ['yes', 'Yes', 'YES', 'True', 'true', 'TRUE', '1'] | ||
| FALSE = ['no', 'No', 'NO', 'False', 'false', 'FALSE', '0'] | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, I agree with you. |
||
|
|
||
|
|
||
| ENDCOLLOR = '\033[0m' | ||
| ANIME_SYMBOL = ['..', '>>'] | ||
| AUTHOR_COLLOR = '\033[94m' | ||
|
|
@@ -44,6 +50,20 @@ | |
| } | ||
|
|
||
|
|
||
| def setup_ssl_context(ignore_ssl): | ||
| """Disable SSL verification if ignore_ssl=True""" | ||
|
|
||
| if ignore_ssl: | ||
| try: | ||
| _create_unverified_https_context = ssl._create_unverified_context | ||
| except AttributeError: | ||
| # Legacy Python that doesn't verify HTTPS certificates by default | ||
| pass | ||
| else: | ||
| # Handle target environment that doesn't support HTTPS verification | ||
| ssl._create_default_https_context = _create_unverified_https_context | ||
|
|
||
|
|
||
| def get_formated_status(job_color, format_pattern="%(color)s%(symbol)s%(run_status)s%(endcollor)s", extra_params=None): | ||
| if not extra_params: | ||
| extra_params = {} | ||
|
|
@@ -87,16 +107,18 @@ class JenkinsCli(object): | |
| "%s branch set to: %s") | ||
|
|
||
| def __init__(self, args, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): | ||
| self.jenkins = self.auth(args.host, args.username, args.password, timeout) | ||
| self.jenkins = self.auth(args.host, args.username, args.password, args.ignore_ssl, timeout) | ||
|
|
||
| @classmethod | ||
| def auth(cls, host=None, username=None, password=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): | ||
| def auth(cls, host=None, username=None, password=None, ignore_ssl=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): | ||
| if host is None or username is None or password is None: | ||
| settings_dict = cls.read_settings_from_file() | ||
| try: | ||
| host = host or settings_dict['host'] | ||
| username = username or settings_dict.get('username', None) | ||
| password = password or settings_dict.get('password', None) | ||
| cls.ignore_ssl = ignore_ssl or settings_dict.get('ignore_ssl', 'False') in TRUE | ||
|
|
||
| except KeyError: | ||
| raise CliException('Jenkins "host" should be specified by the command-line option or in the .jenkins-cli file') | ||
| return jenkins.Jenkins(host, username, password, timeout) | ||
|
|
@@ -124,6 +146,7 @@ def read_settings_from_file(cls): | |
| return settings_dict | ||
|
|
||
| def run_command(self, args): | ||
| setup_ssl_context(self.ignore_ssl) | ||
| command = args.jenkins_command | ||
| getattr(self, command)(args) | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think if
ignore_ssl=option is in.jencins-clifile, that means that we do want to ignore ssl errors. So I think we do not needTRUEconstant as well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, I think it will be very weird if someone configures this property like this:
ignore_ssl=Falseand the application continue ignoring SSL errors.That's why I thought it would be a good idea to configure a list with all acceptable strings.
ignore_ssl=also seems strange to me. What do you think?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree that
ignore_ssl=Falsemay looks a bit strange. But the list with all acceptable strings looks strange also.Maybe it will be enough to define behavior in help section?
Something like:
"You can set ignore_ssl in settings file. Any value will be treated as True unless it equals 0"
or
"You can set ignore_ssl=1 in settings file if you want to ignore ssl erros. All other values will be treated as False"
We need to document this option anyway and its hardy possible to find all acceptable strings (for example we can also add 'y' and 'Y')
What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, any case scenario this should be documented on both
README.mdand--help.We could document that the user should set
ignore_ssl=yesand all other cases will be treated asFalseand still have the list.If we decide to accept only one option the comparison will be pretty much the same:
List:
Single accepted pattern:
BTW, I was inspired by ansible when I wrote this list. They pretty much have the same problem, reading config and transforming what it seems to be boolean into python
bool.