From d0f462f0cc3f8d0d8da9397f2f4968a9760e1f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Wed, 12 Jul 2017 09:10:33 +0000
Subject: [PATCH] Task #10875 - updated some config
---
SAS/TriggerServices/bin/triggerrestinterface | 2 +-
.../django_rest/restinterface/credentials.py | 8 +++----
.../django_rest/restinterface/settings.py | 23 +++----------------
3 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/SAS/TriggerServices/bin/triggerrestinterface b/SAS/TriggerServices/bin/triggerrestinterface
index 0bbaccbe037..6a3b6c52ba4 100755
--- a/SAS/TriggerServices/bin/triggerrestinterface
+++ b/SAS/TriggerServices/bin/triggerrestinterface
@@ -24,7 +24,7 @@ echo "---"
echo "! This is for testing only, properly deploy in Apache for production use!"
echo "---"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-python $DIR/../lib/python2.7/site-packages/lofar/triggerservices/manage.py runserver
+python $DIR/../lib64/python2.7/site-packages/lofar/triggerservices/manage.py runserver 0.0.0.0:8000
diff --git a/SAS/TriggerServices/django_rest/restinterface/credentials.py b/SAS/TriggerServices/django_rest/restinterface/credentials.py
index 7a459457fe3..874953f1f56 100644
--- a/SAS/TriggerServices/django_rest/restinterface/credentials.py
+++ b/SAS/TriggerServices/django_rest/restinterface/credentials.py
@@ -1,9 +1,7 @@
-SECRET_KEY = 'c0m_v*ghv5-^+xy@dm7-skg5d7#q(q+*pl!@rie)6+h$ln!zoi'
+SECRET_KEY = "<redacted>"
AUTH_LDAP_SERVER_URI = "ldaps://webportal.astron.nl:30636"
-#AUTH_LDAP_SERVER_URI = "ldaps://dop225.astron.nl:636"
-#AUTH_LDAP_SERVER_URI = "ldap://10.87.2.225"
-AUTH_LDAP_USER_DN_TEMPLATE="uid=%(user)s,ou=Users,o=lofar,c=eu?cn"
+AUTH_LDAP_USER_DN_TEMPLATE="cn=%(user)s,ou=Users,o=lofar,c=eu"
-AUTH_LDAP_BIND_DN = "cn=ltadownload,o=services"
+AUTH_LDAP_BIND_DN = "<redacted>"
AUTH_LDAP_BIND_PASSWORD = "<redacted>"
diff --git a/SAS/TriggerServices/django_rest/restinterface/settings.py b/SAS/TriggerServices/django_rest/restinterface/settings.py
index 8ecbb42a076..3b2f09ea4f5 100644
--- a/SAS/TriggerServices/django_rest/restinterface/settings.py
+++ b/SAS/TriggerServices/django_rest/restinterface/settings.py
@@ -146,29 +146,12 @@ REST_FRAMEWORK = {
'rest_framework.authentication.SessionAuthentication',
),
#'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAdminUser',),
- 'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.AllowAny',), # todo: CHANGE FOR PRODUCTION TO --> IsAuthenticated
- #'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAuthenticated',),
+ #'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.AllowAny',),
+ 'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAuthenticated',),
'PAGE_SIZE': 10,
}
-# LDAP DEBUG:
-#import logging, logging.handlers
-#logfile = "/tmp/django-ldap-debug.log"
-#my_logger = logging.getLogger('django_auth_ldap')
-#my_logger.setLevel(logging.DEBUG)
-#handler = logging.handlers.RotatingFileHandler(
-# logfile, maxBytes=1024 * 500, backupCount=5)
-#my_logger.addHandler(handler)
-#import ldap
-#print "---"
-#server = 'ldap://10.87.2.225'
-#user_dn = credentials.AUTH_LDAP_BIND_DN
-#password = credentials.AUTH_LDAP_BIND_PASSWORD
-#con = ldap.initialize(server)
-#print "---"
-#con.simple_bind_s(user_dn, password)
-#print "---"
-
+#AUTH_LDAP_GLOBAL_OPTIONS = { ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER }
#AUTH_LDAP_CONNECTION_OPTIONS = { ldap.OPT_X_TLS_REQUIRE_CERT : ldap.OPT_X_TLS_NEVER }
AUTH_LDAP_SERVER_URI = credentials.AUTH_LDAP_SERVER_URI
AUTH_LDAP_BIND_DN = credentials.AUTH_LDAP_BIND_DN
--
GitLab