Skip to content

Commit 260b78d

Browse files
pitbulkpitbulk
committed
Adjust format to black
1 parent 7d8184a commit 260b78d

34 files changed

+2729
-3378
lines changed

‎demo-django/demo/urls.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
from django.urls import re_path
22
from django.contrib import admin
33
from .views import attrs, index, metadata
4+
45
admin.autodiscover()
56

67
urlpatterns = [
7-
re_path(r'^$', index, name='index'),
8-
re_path(r'^attrs/$', attrs, name='attrs'),
9-
re_path(r'^metadata/$', metadata, name='metadata'),
8+
re_path(r"^$", index, name="index"),
9+
re_path(r"^attrs/$", attrs, name="attrs"),
10+
re_path(r"^metadata/$", metadata, name="metadata"),
1011
]

‎demo-django/demo/views.py‎

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from django.conf import settings
22
from django.urls import reverse
3-
from django.http import (HttpResponse, HttpResponseRedirect,
4-
HttpResponseServerError)
3+
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError
54
from django.shortcuts import render
65

76
from onelogin.saml2.auth import OneLogin_Saml2_Auth
@@ -17,13 +16,13 @@ def init_saml_auth(req):
1716
def prepare_django_request(request):
1817
# If server is behind proxys or balancers use the HTTP_X_FORWARDED fields
1918
result = {
20-
'https': 'on' if request.is_secure() else 'off',
21-
'http_host': request.META['HTTP_HOST'],
22-
'script_name': request.META['PATH_INFO'],
23-
'get_data': request.GET.copy(),
19+
"https": "on" if request.is_secure() else "off",
20+
"http_host": request.META["HTTP_HOST"],
21+
"script_name": request.META["PATH_INFO"],
22+
"get_data": request.GET.copy(),
2423
# Uncomment if using ADFS as IdP, https://github.com/onelogin/python-saml/pull/144
2524
# 'lowercase_urlencoding': True,
26-
'post_data': request.POST.copy()
25+
"post_data": request.POST.copy(),
2726
}
2827
return result
2928

@@ -38,61 +37,61 @@ def index(request):
3837
attributes = False
3938
paint_logout = False
4039

41-
if 'sso' in req['get_data']:
40+
if "sso" in req["get_data"]:
4241
return HttpResponseRedirect(auth.login())
4342
# If AuthNRequest ID need to be stored in order to later validate it, do instead
4443
# sso_built_url = auth.login()
4544
# request.session['AuthNRequestID'] = auth.get_last_request_id()
4645
# return HttpResponseRedirect(sso_built_url)
47-
elif 'sso2' in req['get_data']:
48-
return_to = OneLogin_Saml2_Utils.get_self_url(req) + reverse('attrs')
46+
elif "sso2" in req["get_data"]:
47+
return_to = OneLogin_Saml2_Utils.get_self_url(req) + reverse("attrs")
4948
return HttpResponseRedirect(auth.login(return_to))
50-
elif 'slo' in req['get_data']:
49+
elif "slo" in req["get_data"]:
5150
name_id = session_index = name_id_format = name_id_nq = name_id_spnq = None
52-
if 'samlNameId' in request.session:
53-
name_id = request.session['samlNameId']
54-
if 'samlSessionIndex' in request.session:
55-
session_index = request.session['samlSessionIndex']
56-
if 'samlNameIdFormat' in request.session:
57-
name_id_format = request.session['samlNameIdFormat']
58-
if 'samlNameIdNameQualifier' in request.session:
59-
name_id_nq = request.session['samlNameIdNameQualifier']
60-
if 'samlNameIdSPNameQualifier' in request.session:
61-
name_id_spnq = request.session['samlNameIdSPNameQualifier']
51+
if "samlNameId" in request.session:
52+
name_id = request.session["samlNameId"]
53+
if "samlSessionIndex" in request.session:
54+
session_index = request.session["samlSessionIndex"]
55+
if "samlNameIdFormat" in request.session:
56+
name_id_format = request.session["samlNameIdFormat"]
57+
if "samlNameIdNameQualifier" in request.session:
58+
name_id_nq = request.session["samlNameIdNameQualifier"]
59+
if "samlNameIdSPNameQualifier" in request.session:
60+
name_id_spnq = request.session["samlNameIdSPNameQualifier"]
6261

6362
return HttpResponseRedirect(auth.logout(name_id=name_id, session_index=session_index, nq=name_id_nq, name_id_format=name_id_format, spnq=name_id_spnq))
6463
# If LogoutRequest ID need to be stored in order to later validate it, do instead
6564
# slo_built_url = auth.logout(name_id=name_id, session_index=session_index)
6665
# request.session['LogoutRequestID'] = auth.get_last_request_id()
6766
# return HttpResponseRedirect(slo_built_url)
68-
elif 'acs' in req['get_data']:
67+
elif "acs" in req["get_data"]:
6968
request_id = None
70-
if 'AuthNRequestID' in request.session:
71-
request_id = request.session['AuthNRequestID']
69+
if "AuthNRequestID" in request.session:
70+
request_id = request.session["AuthNRequestID"]
7271

7372
auth.process_response(request_id=request_id)
7473
errors = auth.get_errors()
7574
not_auth_warn = not auth.is_authenticated()
7675

7776
if not errors:
78-
if 'AuthNRequestID' in request.session:
79-
del request.session['AuthNRequestID']
80-
request.session['samlUserdata'] = auth.get_attributes()
81-
request.session['samlNameId'] = auth.get_nameid()
82-
request.session['samlNameIdFormat'] = auth.get_nameid_format()
83-
request.session['samlNameIdNameQualifier'] = auth.get_nameid_nq()
84-
request.session['samlNameIdSPNameQualifier'] = auth.get_nameid_spnq()
85-
request.session['samlSessionIndex'] = auth.get_session_index()
86-
if 'RelayState' in req['post_data'] and OneLogin_Saml2_Utils.get_self_url(req) != req['post_data']['RelayState']:
77+
if "AuthNRequestID" in request.session:
78+
del request.session["AuthNRequestID"]
79+
request.session["samlUserdata"] = auth.get_attributes()
80+
request.session["samlNameId"] = auth.get_nameid()
81+
request.session["samlNameIdFormat"] = auth.get_nameid_format()
82+
request.session["samlNameIdNameQualifier"] = auth.get_nameid_nq()
83+
request.session["samlNameIdSPNameQualifier"] = auth.get_nameid_spnq()
84+
request.session["samlSessionIndex"] = auth.get_session_index()
85+
if "RelayState" in req["post_data"] and OneLogin_Saml2_Utils.get_self_url(req) != req["post_data"]["RelayState"]:
8786
# To avoid 'Open Redirect' attacks, before execute the redirection confirm
8887
# the value of the req['post_data']['RelayState'] is a trusted URL.
89-
return HttpResponseRedirect(auth.redirect_to(req['post_data']['RelayState']))
88+
return HttpResponseRedirect(auth.redirect_to(req["post_data"]["RelayState"]))
9089
elif auth.get_settings().is_debug_active():
9190
error_reason = auth.get_last_error_reason()
92-
elif 'sls' in req['get_data']:
91+
elif "sls" in req["get_data"]:
9392
request_id = None
94-
if 'LogoutRequestID' in request.session:
95-
request_id = request.session['LogoutRequestID']
93+
if "LogoutRequestID" in request.session:
94+
request_id = request.session["LogoutRequestID"]
9695
dscb = lambda: request.session.flush()
9796
url = auth.process_slo(request_id=request_id, delete_session_cb=dscb)
9897
errors = auth.get_errors()
@@ -106,26 +105,25 @@ def index(request):
106105
elif auth.get_settings().is_debug_active():
107106
error_reason = auth.get_last_error_reason()
108107

109-
if 'samlUserdata' in request.session:
108+
if "samlUserdata" in request.session:
110109
paint_logout = True
111-
if len(request.session['samlUserdata']) > 0:
112-
attributes = request.session['samlUserdata'].items()
110+
if len(request.session["samlUserdata"]) > 0:
111+
attributes = request.session["samlUserdata"].items()
113112

114-
return render(request, 'index.html', {'errors': errors, 'error_reason': error_reason, 'not_auth_warn': not_auth_warn, 'success_slo': success_slo,
115-
'attributes': attributes, 'paint_logout': paint_logout})
113+
return render(
114+
request, "index.html", {"errors": errors, "error_reason": error_reason, "not_auth_warn": not_auth_warn, "success_slo": success_slo, "attributes": attributes, "paint_logout": paint_logout}
115+
)
116116

117117

118118
def attrs(request):
119119
paint_logout = False
120120
attributes = False
121121

122-
if 'samlUserdata' in request.session:
122+
if "samlUserdata" in request.session:
123123
paint_logout = True
124-
if len(request.session['samlUserdata']) > 0:
125-
attributes = request.session['samlUserdata'].items()
126-
return render(request, 'attrs.html',
127-
{'paint_logout': paint_logout,
128-
'attributes': attributes})
124+
if len(request.session["samlUserdata"]) > 0:
125+
attributes = request.session["samlUserdata"].items()
126+
return render(request, "attrs.html", {"paint_logout": paint_logout, "attributes": attributes})
129127

130128

131129
def metadata(request):
@@ -137,7 +135,7 @@ def metadata(request):
137135
errors = saml_settings.validate_metadata(metadata)
138136

139137
if len(errors) == 0:
140-
resp = HttpResponse(content=metadata, content_type='text/xml')
138+
resp = HttpResponse(content=metadata, content_type="text/xml")
141139
else:
142-
resp = HttpResponseServerError(content=', '.join(errors))
140+
resp = HttpResponseServerError(content=", ".join(errors))
143141
return resp

‎demo-django/demo/wsgi.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"""
99

1010
import os
11+
1112
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
1213

1314
from django.core.wsgi import get_wsgi_application # noqa: E402
15+
1416
application = get_wsgi_application()

‎demo-flask/index.py‎

Lines changed: 53 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
import os
22

3-
from flask import (Flask, request, render_template, redirect, session,
4-
make_response)
3+
from flask import Flask, request, render_template, redirect, session, make_response
54

65
from onelogin.saml2.auth import OneLogin_Saml2_Auth
76
from onelogin.saml2.utils import OneLogin_Saml2_Utils
87

98

109
app = Flask(__name__)
11-
app.config['SECRET_KEY'] = 'onelogindemopytoolkit'
12-
app.config['SAML_PATH'] = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'saml')
10+
app.config["SECRET_KEY"] = "onelogindemopytoolkit"
11+
app.config["SAML_PATH"] = os.path.join(os.path.dirname(os.path.abspath(__file__)), "saml")
1312

1413

1514
def init_saml_auth(req):
16-
auth = OneLogin_Saml2_Auth(req, custom_base_path=app.config['SAML_PATH'])
15+
auth = OneLogin_Saml2_Auth(req, custom_base_path=app.config["SAML_PATH"])
1716
return auth
1817

1918

2019
def prepare_flask_request(request):
2120
# If server is behind proxys or balancers use the HTTP_X_FORWARDED fields
2221
return {
23-
'https': 'on' if request.scheme == 'https' else 'off',
24-
'http_host': request.host,
25-
'script_name': request.path,
26-
'get_data': request.args.copy(),
22+
"https": "on" if request.scheme == "https" else "off",
23+
"http_host": request.host,
24+
"script_name": request.path,
25+
"get_data": request.args.copy(),
2726
# Uncomment if using ADFS as IdP, https://github.com/onelogin/python-saml/pull/144
2827
# 'lowercase_urlencoding': True,
29-
'post_data': request.form.copy()
28+
"post_data": request.form.copy(),
3029
}
3130

3231

33-
@app.route('/', methods=['GET', 'POST'])
32+
@app.route("/", methods=["GET", "POST"])
3433
def index():
3534
req = prepare_flask_request(request)
3635
auth = init_saml_auth(req)
@@ -41,57 +40,57 @@ def index():
4140
attributes = False
4241
paint_logout = False
4342

44-
if 'sso' in request.args:
43+
if "sso" in request.args:
4544
return redirect(auth.login())
4645
# If AuthNRequest ID need to be stored in order to later validate it, do instead
4746
# sso_built_url = auth.login()
4847
# request.session['AuthNRequestID'] = auth.get_last_request_id()
4948
# return redirect(sso_built_url)
50-
elif 'sso2' in request.args:
51-
return_to = '%sattrs/' % request.host_url
49+
elif "sso2" in request.args:
50+
return_to = "%sattrs/" % request.host_url
5251
return redirect(auth.login(return_to))
53-
elif 'slo' in request.args:
52+
elif "slo" in request.args:
5453
name_id = session_index = name_id_format = name_id_nq = name_id_spnq = None
55-
if 'samlNameId' in session:
56-
name_id = session['samlNameId']
57-
if 'samlSessionIndex' in session:
58-
session_index = session['samlSessionIndex']
59-
if 'samlNameIdFormat' in session:
60-
name_id_format = session['samlNameIdFormat']
61-
if 'samlNameIdNameQualifier' in session:
62-
name_id_nq = session['samlNameIdNameQualifier']
63-
if 'samlNameIdSPNameQualifier' in session:
64-
name_id_spnq = session['samlNameIdSPNameQualifier']
54+
if "samlNameId" in session:
55+
name_id = session["samlNameId"]
56+
if "samlSessionIndex" in session:
57+
session_index = session["samlSessionIndex"]
58+
if "samlNameIdFormat" in session:
59+
name_id_format = session["samlNameIdFormat"]
60+
if "samlNameIdNameQualifier" in session:
61+
name_id_nq = session["samlNameIdNameQualifier"]
62+
if "samlNameIdSPNameQualifier" in session:
63+
name_id_spnq = session["samlNameIdSPNameQualifier"]
6564

6665
return redirect(auth.logout(name_id=name_id, session_index=session_index, nq=name_id_nq, name_id_format=name_id_format, spnq=name_id_spnq))
67-
elif 'acs' in request.args:
66+
elif "acs" in request.args:
6867
request_id = None
69-
if 'AuthNRequestID' in session:
70-
request_id = session['AuthNRequestID']
68+
if "AuthNRequestID" in session:
69+
request_id = session["AuthNRequestID"]
7170

7271
auth.process_response(request_id=request_id)
7372
errors = auth.get_errors()
7473
not_auth_warn = not auth.is_authenticated()
7574
if len(errors) == 0:
76-
if 'AuthNRequestID' in session:
77-
del session['AuthNRequestID']
78-
session['samlUserdata'] = auth.get_attributes()
79-
session['samlNameId'] = auth.get_nameid()
80-
session['samlNameIdFormat'] = auth.get_nameid_format()
81-
session['samlNameIdNameQualifier'] = auth.get_nameid_nq()
82-
session['samlNameIdSPNameQualifier'] = auth.get_nameid_spnq()
83-
session['samlSessionIndex'] = auth.get_session_index()
75+
if "AuthNRequestID" in session:
76+
del session["AuthNRequestID"]
77+
session["samlUserdata"] = auth.get_attributes()
78+
session["samlNameId"] = auth.get_nameid()
79+
session["samlNameIdFormat"] = auth.get_nameid_format()
80+
session["samlNameIdNameQualifier"] = auth.get_nameid_nq()
81+
session["samlNameIdSPNameQualifier"] = auth.get_nameid_spnq()
82+
session["samlSessionIndex"] = auth.get_session_index()
8483
self_url = OneLogin_Saml2_Utils.get_self_url(req)
85-
if 'RelayState' in request.form and self_url != request.form['RelayState']:
84+
if "RelayState" in request.form and self_url != request.form["RelayState"]:
8685
# To avoid 'Open Redirect' attacks, before execute the redirection confirm
8786
# the value of the request.form['RelayState'] is a trusted URL.
88-
return redirect(auth.redirect_to(request.form['RelayState']))
87+
return redirect(auth.redirect_to(request.form["RelayState"]))
8988
elif auth.get_settings().is_debug_active():
9089
error_reason = auth.get_last_error_reason()
91-
elif 'sls' in request.args:
90+
elif "sls" in request.args:
9291
request_id = None
93-
if 'LogoutRequestID' in session:
94-
request_id = session['LogoutRequestID']
92+
if "LogoutRequestID" in session:
93+
request_id = session["LogoutRequestID"]
9594
dscb = lambda: session.clear()
9695
url = auth.process_slo(request_id=request_id, delete_session_cb=dscb)
9796
errors = auth.get_errors()
@@ -105,37 +104,28 @@ def index():
105104
elif auth.get_settings().is_debug_active():
106105
error_reason = auth.get_last_error_reason()
107106

108-
if 'samlUserdata' in session:
107+
if "samlUserdata" in session:
109108
paint_logout = True
110-
if len(session['samlUserdata']) > 0:
111-
attributes = session['samlUserdata'].items()
109+
if len(session["samlUserdata"]) > 0:
110+
attributes = session["samlUserdata"].items()
112111

113-
return render_template(
114-
'index.html',
115-
errors=errors,
116-
error_reason=error_reason,
117-
not_auth_warn=not_auth_warn,
118-
success_slo=success_slo,
119-
attributes=attributes,
120-
paint_logout=paint_logout
121-
)
112+
return render_template("index.html", errors=errors, error_reason=error_reason, not_auth_warn=not_auth_warn, success_slo=success_slo, attributes=attributes, paint_logout=paint_logout)
122113

123114

124-
@app.route('/attrs/')
115+
@app.route("/attrs/")
125116
def attrs():
126117
paint_logout = False
127118
attributes = False
128119

129-
if 'samlUserdata' in session:
120+
if "samlUserdata" in session:
130121
paint_logout = True
131-
if len(session['samlUserdata']) > 0:
132-
attributes = session['samlUserdata'].items()
122+
if len(session["samlUserdata"]) > 0:
123+
attributes = session["samlUserdata"].items()
133124

134-
return render_template('attrs.html', paint_logout=paint_logout,
135-
attributes=attributes)
125+
return render_template("attrs.html", paint_logout=paint_logout, attributes=attributes)
136126

137127

138-
@app.route('/metadata/')
128+
@app.route("/metadata/")
139129
def metadata():
140130
req = prepare_flask_request(request)
141131
auth = init_saml_auth(req)
@@ -145,11 +135,11 @@ def metadata():
145135

146136
if len(errors) == 0:
147137
resp = make_response(metadata, 200)
148-
resp.headers['Content-Type'] = 'text/xml'
138+
resp.headers["Content-Type"] = "text/xml"
149139
else:
150-
resp = make_response(', '.join(errors), 500)
140+
resp = make_response(", ".join(errors), 500)
151141
return resp
152142

153143

154144
if __name__ == "__main__":
155-
app.run(host='0.0.0.0', port=8000, debug=True)
145+
app.run(host="0.0.0.0", port=8000, debug=True)

‎demo-tornado/Settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
BASE_DIR = os.path.dirname(__file__)
44

5-
SAML_PATH = os.path.join(BASE_DIR, 'saml')
6-
TEMPLATE_PATH = os.path.join(BASE_DIR, 'templates')
5+
SAML_PATH = os.path.join(BASE_DIR, "saml")
6+
TEMPLATE_PATH = os.path.join(BASE_DIR, "templates")

0 commit comments

Comments
 (0)