Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packet/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from flask import Flask
from flask_migrate import Migrate
from flask_pyoidc.flask_pyoidc import OIDCAuthentication
from flask_pyoidc.provider_configuration import ProviderConfiguration, ClientMetadata
from flask_sqlalchemy import SQLAlchemy

from ._version import __version__
Expand All @@ -27,11 +28,11 @@
db = SQLAlchemy(app)
migrate = Migrate(app, db)

auth = OIDCAuthentication(app, issuer=app.config["OIDC_ISSUER"], client_registration_info={
"client_id": app.config["OIDC_CLIENT_ID"],
"client_secret": app.config["OIDC_CLIENT_SECRET"],
"post_logout_redirect_uris": "/logout/"
})
APP_CONFIG = ProviderConfiguration(issuer=app.config["OIDC_ISSUER"],
client_metadata=ClientMetadata(app.config["OIDC_CLIENT_ID"],
app.config["OIDC_CLIENT_SECRET"]))

auth = OIDCAuthentication({'app': APP_CONFIG}, app)

# LDAP
_ldap = csh_ldap.CSHLDAP(app.config["LDAP_BIND_DN"], app.config["LDAP_BIND_PASS"])
Expand Down
2 changes: 1 addition & 1 deletion packet/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def packet_auth(func):
"""
Decorator for easily configuring oidc
"""
@auth.oidc_auth
@auth.oidc_auth('app')
@wraps(func)
def wrapped_function(*args, **kwargs):
if app.config["REALM"] == "csh":
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Flask==1.0.2
Flask-pyoidc==1.3.0
Flask-pyoidc==2.0.0
flask_sqlalchemy==2.3.2
psycopg2-binary==2.7.5
Flask-Migrate==2.2.1
Expand Down