File tree Expand file tree Collapse file tree 7 files changed +12
-8
lines changed
Expand file tree Collapse file tree 7 files changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -153,7 +153,7 @@ def employee_client(username=None,
153153 proxy = None ,
154154 user_agent = None ,
155155 transport = None ,
156- verify = False ):
156+ verify = True ):
157157 """Creates an INTERNAL SoftLayer API client using your environment.
158158
159159 Settings are loaded via keyword arguments, environemtal variables and config file.
@@ -178,10 +178,11 @@ def employee_client(username=None,
178178 endpoint_url = endpoint_url ,
179179 timeout = timeout ,
180180 proxy = proxy ,
181- verify = verify ,
181+ verify = None ,
182182 config_file = config_file )
183183
184184 url = settings .get ('endpoint_url' )
185+ verify = settings .get ('verify' , True )
185186
186187 if 'internal' not in url :
187188 raise exceptions .SoftLayerError (f"{ url } does not look like an Internal Employee url." )
Original file line number Diff line number Diff line change 44
55import click
66
7+ from SoftLayer .API import employee_client
78from SoftLayer .CLI .command import SLCommand as SLCommand
89from SoftLayer .CLI import environment
910from SoftLayer import config
@@ -30,7 +31,7 @@ def cli(env):
3031 username = settings .get ('username' ) or os .environ .get ('SLCLI_USER' , None )
3132 password = os .environ .get ('SLCLI_PASSWORD' , '' )
3233 yubi = None
33- client = env . client
34+ client = employee_client ()
3435
3536 # Might already be logged in, try and refresh token
3637 if settings .get ('access_token' ) and settings .get ('userid' ):
Original file line number Diff line number Diff line change @@ -60,7 +60,8 @@ def get_client_settings_config_file(**kwargs): # pylint: disable=inconsistent-r
6060 'timeout' : '0' ,
6161 'proxy' : '' ,
6262 'userid' : '' ,
63- 'access_token' : ''
63+ 'access_token' : '' ,
64+ 'verify' : True
6465 })
6566 config .read (config_files )
6667
@@ -73,6 +74,7 @@ def get_client_settings_config_file(**kwargs): # pylint: disable=inconsistent-r
7374 'api_key' : config .get ('softlayer' , 'api_key' ),
7475 'userid' : config .get ('softlayer' , 'userid' ),
7576 'access_token' : config .get ('softlayer' , 'access_token' ),
77+ 'verify' : config .get ('softlayer' , 'verify' )
7678 }
7779
7880
Original file line number Diff line number Diff line change @@ -108,7 +108,6 @@ def __call__(self, request):
108108 request .url = '%s.%s' % ('/' .join (url_parts ), 'json' )
109109
110110 # Prefer the request setting, if it's not None
111-
112111 if request .verify is None :
113112 request .verify = self .verify
114113
Original file line number Diff line number Diff line change @@ -56,7 +56,9 @@ def __init__(self):
5656 #: Transport headers.
5757 self .transport_headers = {}
5858
59- #: Boolean specifying if the server certificate should be verified.
59+ #: False -> Don't verify the SSL certificate
60+ #: True -> Verify the SSL certificate
61+ #: Path String -> Verify the SSL certificate with the .pem file at path
6062 self .verify = None
6163
6264 #: Client certificate file path. (Used by X509Authentication)
Original file line number Diff line number Diff line change @@ -84,8 +84,7 @@ def __call__(self, request):
8484 encoding = "iso-8859-1" )
8585
8686 # Prefer the request setting, if it's not None
87- verify = request .verify
88- if verify is None :
87+ if request .verify is None :
8988 request .verify = self .verify
9089
9190 try :
You can’t perform that action at this time.
0 commit comments