burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed 404 & 500 templates for new

Browse Source 
* Try ssl before non ssl on domain os manager connections
This commit is contained in:
Adolfo Gómez García 2019-04-02 23:23:12 +02:00
parent 09eb130b11
commit 5422dcf78d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py
View File

@ -100,6 +100,14 @@ class WinDomainOsManager(WindowsOsManager):
account += '@' + self._domain
_str = "No servers found"
# First, tries to connect using SSL
for server in servers:
try:
return ldaputil.connection(account, self._password, server[0], -1, ssl=True, timeout=10, debug=False)
except Exception as e:
_str = 'Error: {}'.format(e)
# And if not possible, try using NON-SSL
for server in servers:
try:
return ldaputil.connection(account, self._password, server[0], server[1], ssl=False, timeout=10, debug=False)
@ -172,7 +180,7 @@ class WinDomainOsManager(WindowsOsManager):
break
except ldaputil.LDAPError:
logger.exception('Ldap Exception caught')
error = "Could not remove machine from domain (invalid credentials for {0})".format(self._account)
error = "Could not add machine (invalid credentials? for {0})".format(self._account)
except Exception as e:
error = "Could not add machine {} to group {}: {}".format(userService.friendly_name, self._group, e)
# logger.exception('Ldap Exception caught')

3
server/src/uds/templates/404.html
View File

@ -1,7 +1,6 @@
{% load i18n %}
<html>
<head>
<script type="text/javascript" src="{% url 'uds.web.views.jsCatalog' LANGUAGE_CODE %}"></script>
<script type="text/javascript">
function onLoad() {
var msg = window.btoa(django.gettext('Page not found'));
@ -11,4 +10,4 @@
</head>
<body onload="onLoad()">
</body>
</html>
</html>

3
server/src/uds/templates/500.html
View File

@ -1,7 +1,6 @@
{% load i18n %}
<html>
<head>
<script type="text/javascript" src="{% url 'uds.web.views.jsCatalog' LANGUAGE_CODE %}"></script>
<script type="text/javascript">
function onLoad() {
var msg = window.btoa(django.gettext('Internal server error'));
@ -11,4 +10,4 @@
</head>
<body onload="onLoad()">
</body>
</html>
</html>