File tree 7 files changed +12
-8
lines changed
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,
153
153
proxy = None ,
154
154
user_agent = None ,
155
155
transport = None ,
156
- verify = False ):
156
+ verify = True ):
157
157
"""Creates an INTERNAL SoftLayer API client using your environment.
158
158
159
159
Settings are loaded via keyword arguments, environemtal variables and config file.
@@ -178,10 +178,11 @@ def employee_client(username=None,
178
178
endpoint_url = endpoint_url ,
179
179
timeout = timeout ,
180
180
proxy = proxy ,
181
- verify = verify ,
181
+ verify = None ,
182
182
config_file = config_file )
183
183
184
184
url = settings .get ('endpoint_url' )
185
+ verify = settings .get ('verify' , True )
185
186
186
187
if 'internal' not in url :
187
188
raise exceptions .SoftLayerError (f"{ url } does not look like an Internal Employee url." )
Original file line number Diff line number Diff line change 4
4
5
5
import click
6
6
7
+ from SoftLayer .API import employee_client
7
8
from SoftLayer .CLI .command import SLCommand as SLCommand
8
9
from SoftLayer .CLI import environment
9
10
from SoftLayer import config
@@ -30,7 +31,7 @@ def cli(env):
30
31
username = settings .get ('username' ) or os .environ .get ('SLCLI_USER' , None )
31
32
password = os .environ .get ('SLCLI_PASSWORD' , '' )
32
33
yubi = None
33
- client = env . client
34
+ client = employee_client ()
34
35
35
36
# Might already be logged in, try and refresh token
36
37
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
60
60
'timeout' : '0' ,
61
61
'proxy' : '' ,
62
62
'userid' : '' ,
63
- 'access_token' : ''
63
+ 'access_token' : '' ,
64
+ 'verify' : True
64
65
})
65
66
config .read (config_files )
66
67
@@ -73,6 +74,7 @@ def get_client_settings_config_file(**kwargs): # pylint: disable=inconsistent-r
73
74
'api_key' : config .get ('softlayer' , 'api_key' ),
74
75
'userid' : config .get ('softlayer' , 'userid' ),
75
76
'access_token' : config .get ('softlayer' , 'access_token' ),
77
+ 'verify' : config .get ('softlayer' , 'verify' )
76
78
}
77
79
78
80
Original file line number Diff line number Diff line change @@ -108,7 +108,6 @@ def __call__(self, request):
108
108
request .url = '%s.%s' % ('/' .join (url_parts ), 'json' )
109
109
110
110
# Prefer the request setting, if it's not None
111
-
112
111
if request .verify is None :
113
112
request .verify = self .verify
114
113
Original file line number Diff line number Diff line change @@ -56,7 +56,9 @@ def __init__(self):
56
56
#: Transport headers.
57
57
self .transport_headers = {}
58
58
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
60
62
self .verify = None
61
63
62
64
#: 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):
84
84
encoding = "iso-8859-1" )
85
85
86
86
# Prefer the request setting, if it's not None
87
- verify = request .verify
88
- if verify is None :
87
+ if request .verify is None :
89
88
request .verify = self .verify
90
89
91
90
try :
You can’t perform that action at this time.
0 commit comments