diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0290f10562d9415acb30b734137161fb15a68c0f..86aa1b1d428bfa6049248e0c831a6e47c3baf7cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,6 +134,8 @@ behave-integration:
DATABASE_HOST: "172.17.0.2" # 172.17.0.2 -> postgres
URLS_LOGIN: "http://172.17.0.3:5000/" # 172.17.0.3 -> login
URLS_LOGOUT: "http://172.17.0.3:5000/logout"
+ LOGOUT_URL: "http://172.17.0.3:5000/logout"
+ URLS_POST_LOGOUT_REDIRECT: "http://172.17.0.3:5000/"
URLS_CONSENT: "http://172.17.0.4:5001/" # 172.17.0.4 -> consent
URLS_SELF_ISSUER: "http://172.17.0.5:4444/" # 172.17.0.5 -> hydra
HYDRA_ADMIN_URL: "http://172.17.0.5:4445"
@@ -168,7 +170,7 @@ behave-integration:
- /bin/sh user-panel/utils/grant-access.sh ${TESTUSER_USERNAME} ${KEY} backend 5000
- /bin/sh test/create-hydra-client.sh ${KEY} ${SECRET} hydra 4445 http://oauth:5000/callback
- cd test/login_logout/test/behave/
- - python3 -m behave -D headless=True -D url=http://oauth:5000 -D username=${TESTUSER_USERNAME} -D password=${TESTUSER_PASSWORD}
+ - python3 -m behave -D headless=True -D url=http://oauth:5000 -D logout_url=http://oauth:5000/logout -D username=${TESTUSER_USERNAME} -D password=${TESTUSER_PASSWORD}
artifacts:
paths:
- test/login_logout/test/behave/screenshots/
diff --git a/docker-compose.yml b/docker-compose.yml
index 484d3c49026678129750c2926936c97a8f7d8bed..26e1df1021ac06c21d27c7e296ea81e0b641726b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
- URLS_CONSENT=http://oas.example.net:5001/
- URLS_LOGIN=http://oas.example.net:5000/
- URLS_LOGOUT=http://oas.example.net:5000/logout
+ - URLS_POST_LOGOUT_REDIRECT=http://oas.example.net:5000/
- DSN=memory
- SECRETS_SYSTEM=youReallyNeedToChangeThis
- OIDC_SUBJECT_TYPES_SUPPORTED=public,pairwise
diff --git a/login_provider/app.py b/login_provider/app.py
index acec10da7c36b6ba519d9788d449059bac07cb98..ba85dcde002050cfeeb980d0366d86450c5dcb5c 100644
--- a/login_provider/app.py
+++ b/login_provider/app.py
@@ -56,11 +56,9 @@ def is_safe_url(url):
and url[18:].isalnum() or safe else False
return safe
-@app.route('/logout', methods=['POST'])
+@app.route('/logout', methods=['POST', 'GET'])
def logout():
- logout_form = LogoutForm()
- if logout_form.validate():
- logout_user()
+ logout_user()
return redirect(url_for('home'))
if __name__ == '__main__':
diff --git a/test/login_logout/app.py b/test/login_logout/app.py
index f2b8a6cfee51227930b70d09c3097fd98f3478d5..87420ec91fa094582a7abdc924b3d253cefb7331 100644
--- a/test/login_logout/app.py
+++ b/test/login_logout/app.py
@@ -8,6 +8,7 @@ import uuid
BASE_URL=environ["BASE_URL"]
ACCESS_TOKEN_URL=environ["ACCESS_TOKEN_URL"]
+LOGOUT_URL=environ["LOGOUT_URL"]
AUTHORIZE_URL=environ["AUTHORIZE_URL"]
KEY=environ["KEY"]
SECRET=environ["SECRET"]
@@ -35,10 +36,17 @@ def get_sso_token(token=None):
def login():
return sso.authorize(url_for('callback', _external=True))
+@app.route('/logout')
+def logout():
+ del session['sso_token']
+ return redirect(LOGOUT_URL)
+
@app.route('/callback')
def callback():
resp = sso.authorized_response()
if resp is None:
+ if "error" in request.args:
+ return jsonify(request.args)
abort(403)
session['sso_token'] = (resp['access_token'],None)
return jsonify(resp)
diff --git a/test/login_logout/test/behave/features/environment.py b/test/login_logout/test/behave/features/environment.py
index 4adf4847f259780d3b2b65b990a83e93f4b71ea6..53dff843851bace237e8c45fd090486101d764d6 100644
--- a/test/login_logout/test/behave/features/environment.py
+++ b/test/login_logout/test/behave/features/environment.py
@@ -38,6 +38,7 @@ def before_tag(context, tag):
values = dict()
userdata = context.config.userdata
values['url'] = userdata.get('url')
+ values['logout_url'] = userdata.get('logout_url')
values['username'] = userdata.get('username')
values['password'] = userdata.get('password')
assert values['url'], 'url variable missing in' \
diff --git a/test/login_logout/test/behave/features/login.feature b/test/login_logout/test/behave/features/login.feature
index 156c338a7bc4ca63ce754a3c84f25bee7152241a..b39728822ea56427a15fbe0c71ebba89274afc5b 100644
--- a/test/login_logout/test/behave/features/login.feature
+++ b/test/login_logout/test/behave/features/login.feature
@@ -19,3 +19,9 @@ Scenario: Login with a valid user with access to application
And I expect that element "input#username" does not exist
And I expect that the path is "/callback"
And I expect that element "body" contains the text "access_token"
+
+Scenario: Logout
+ Given I open the logout URL
+ Then I wait on element "input#username" for 1000ms to be visible
+ And I expect that element "input#password" is visible
+ And I expect that element "input#submit" is visible
diff --git a/test/login_logout/test/behave/features/steps/login.py b/test/login_logout/test/behave/features/steps/login.py
index b4fa87a53e498aca66a3ba42f3f44ef6be71672e..ba1a9dfb52d3f512561b39633732b8ecd53bee82 100644
--- a/test/login_logout/test/behave/features/steps/login.py
+++ b/test/login_logout/test/behave/features/steps/login.py
@@ -12,10 +12,16 @@ def before_all(context):
@when(u'I open the URL')
@given(u'I open the URL')
def step_impl(context):
- """Open nextcloud URL."""
+ """Open oauth client URL."""
context.behave_driver.get(context.oauth['url'])
+@when(u'I open the logout URL')
+@given(u'I open the logout URL')
+def step_impl(context):
+ """Logout by visitng the logout url"""
+ context.behave_driver.get(context.oauth['logout_url'])
+
@when(u'I enter the "{attribute}" in the inputfield "{element}"')
def step_impl(context, attribute, element):