pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Added support for disabling ssl verification on gitlab backend

This commit is contained in:
root 2017-03-02 18:46:03 +00:00
parent 55737cf247
commit b9ba692a42
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchestra/contrib/orchestration/helpers.py
View File

@ -53,7 +53,7 @@ def get_instance_url(operation):
try:
url = change_url(operation.instance)
except NoReverseMatch:
alt_repr = '%s-%i' % (operation.content_type, operation.object_id)
alt_repr = '%s-%s' % (operation.content_type, operation.object_id)
return _("Deleted {0}").format(operation.instance_repr or alt_repr)
return orchestra_settings.ORCHESTRA_SITE_URL + url

25
orchestra/contrib/saas/backends/gitlab.py
View File

@ -15,8 +15,9 @@ class GitLabSaaSController(ServiceController):
serialize = True
actions = ('save', 'delete', 'validate_creation')
doc_settings = (settings,
('SAAS_GITLAB_DOMAIN', 'SAAS_GITLAB_ROOT_PASSWORD'),
('SAAS_GITLAB_DOMAIN', 'SAAS_GITLAB_ROOT_PASSWORD', 'SAAS_GITLAB_VERIFY_SSL'),
)
verify = settings.SAAS_GITLAB_VERIFY_SSL
def get_base_url(self):
return 'https://%s/api/v3' % settings.SAAS_GITLAB_DOMAIN
@ -28,7 +29,7 @@ class GitLabSaaSController(ServiceController):
def validate_response(self, response, *status_codes):
if response.status_code not in status_codes:
raise RuntimeError("[%i] %s" % (response.status_code, response.content))
return json.loads(response.content.decode('utf8'))
return response.json()
def authenticate(self):
login_url = self.get_base_url() + '/session'
@ -36,7 +37,7 @@ class GitLabSaaSController(ServiceController):
'login': 'root',
'password': settings.SAAS_GITLAB_ROOT_PASSWORD,
}
response = requests.post(login_url, data=data)
response = requests.post(login_url, data=data, verify=self.verify)
session = self.validate_response(response, 201)
token = session['private_token']
self.headers = {
@ -52,7 +53,7 @@ class GitLabSaaSController(ServiceController):
'username': saas.name,
'name': saas.account.get_full_name(),
}
response = requests.post(user_url, data=data, headers=self.headers)
response = requests.post(user_url, data=data, headers=self.headers, verify=self.verify)
user = self.validate_response(response, 201)
saas.data['user_id'] = user['id']
# Using queryset update to avoid triggering backends with the post_save signal
@ -62,11 +63,11 @@ class GitLabSaaSController(ServiceController):
def change_password(self, saas, server):
self.authenticate()
user_url = self.get_user_url(saas)
response = requests.get(user_url, headers=self.headers)
response = requests.get(user_url, headers=self.headers, verify=self.verify)
user = self.validate_response(response, 200)
user = json.loads(response.content.decode('utf8'))
user = response.json()
user['password'] = saas.password
response = requests.put(user_url, data=user, headers=self.headers)
response = requests.put(user_url, data=user, headers=self.headers, verify=self.verify)
user = self.validate_response(response, 200)
print(json.dumps(user, indent=4))
@ -75,17 +76,17 @@ class GitLabSaaSController(ServiceController):
return
self.authenticate()
user_url = self.get_user_url(saas)
response = requests.get(user_url, headers=self.headers)
response = requests.get(user_url, headers=self.headers, verify=self.verify)
user = self.validate_response(response, 200)
user['state'] = 'active' if saas.active else 'blocked',
response = requests.patch(user_url, data=user, headers=self.headers)
response = requests.patch(user_url, data=user, headers=self.headers, verify=self.verify)
user = self.validate_response(response, 200)
print(json.dumps(user, indent=4))
def delete_user(self, saas, server):
self.authenticate()
user_url = self.get_user_url(saas)
response = requests.delete(user_url, headers=self.headers)
response = requests.delete(user_url, headers=self.headers, verify=self.verify)
user = self.validate_response(response, 200, 404)
print(json.dumps(user, indent=4))
@ -95,8 +96,8 @@ class GitLabSaaSController(ServiceController):
username = saas.name
email = saas.data['email']
users_url = self.get_base_url() + '/users/'
response = requests.get(users_url, headers=self.headers)
users = json.loads(response.content.decode('utf8'))
response = requests.get(users_url, headers=self.headers, verify=self.verify)
users = response.json()
for user in users:
if user['username'] == username:
print('ValidationError: user-exists')

3
orchestra/contrib/saas/settings.py
View File

@ -262,6 +262,9 @@ SAAS_GITLAB_DOMAIN = Setting('SAAS_GITLAB_DOMAIN',
help_text="Uses <tt>ORCHESTRA_BASE_DOMAIN</tt> by default.",
)
SAAS_GITLAB_VERIFY_SSL = Setting('SAAS_GITLAB_VERIFY_SSL',
True,
)
# Moodle