Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CM fixes #1755

Merged
merged 10 commits into from
Dec 4, 2020
+35 −33
Merged

CM fixes #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0903b8b
no message
JohannesDoberer Dec 3, 2020
a71fe28
no message
JohannesDoberer Dec 3, 2020
44a5532
xss fix
JohannesDoberer Dec 3, 2020
3f44ed2
no message
JohannesDoberer Dec 3, 2020
0b5819d
test
JohannesDoberer Dec 3, 2020
60790d6
no message
JohannesDoberer Dec 3, 2020
5b825de
Merge branch 'master' into cm-xss
JohannesDoberer Dec 3, 2020
9618cd4
cleanup
JohannesDoberer Dec 4, 2020
9b296f9
Update website/fiddle/public/auth/idpmock/logout.html
JohannesDoberer Dec 4, 2020
13f014b
Merge branch 'master' into cm-xss
JohannesDoberer Dec 4, 2020
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
6 changes: 3 additions & 3 deletions plugins/auth/src/auth-oidc/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default class openIdConnect {
logout(authData, authOnLogoutFn) {
const signoutData = {
id_token_hint: authData && authData.idToken,
state: window.location.href
state: encodeURI(window.location.href)
};

return this.client
Expand All @@ -105,7 +105,7 @@ export default class openIdConnect {
authOnLogoutFn();
window.location = req.url;
})
.catch(function(err) {
.catch(function (err) {
console.error('[OIDC] logout() Error', err);
authOnLogoutFn();
});
Expand Down Expand Up @@ -176,7 +176,7 @@ export default class openIdConnect {
Luigi.auth().store.removeAuthData();
resolve(response);
})
.catch(function(err) {
.catch(function (err) {
reject(response);
console.error('[OIDC] Logout Error', err);
});
Expand Down
2 changes: 1 addition & 1 deletion website/docs/src/client-js/outer-frame-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { isSearchBot } from './helpers';
export class OuterFrameHandler {
init() {
if (this.outsideIframe() && !isSearchBot) {
const href = window.location.href;
const href = encodeURI(window.location.href);
let newHref;
if (href.includes('/docu-microfrontend')) {
newHref = href.replace('/docu-microfrontend', '').replace('#', '?section=');
Expand Down
35 changes: 16 additions & 19 deletions website/fiddle/public/auth/idpmock/logout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@
<html>

<head>
<title>Luigi Mock Identity Provider</title>
<title>Luigi Mock Identity Provider</title>
</head>

<body>
Logging out...
<script>
window.onload = function() {
let redirectTo = decodeURIComponent(
window.location.href.match(/post_logout_redirect_uri=(.*?)(&|$)/)[1]
);
const decodeChars = (string) => {
return string.replace(/[<>'*+?^${}()|[\]\\]/g, '\\$&')
}
redirectTo = decodeChars(redirectTo);
if(!redirectTo.startsWith(window.location.origin)) {
console.warn("post_logout_redirect_uri has wrong input. You are redirected to /auth/logout.html!");
redirectTo = window.location.origin + '/auth/logout.html';
}
window.location.href = redirectTo;
};
</script>
Logging out...
<script>
window.onload = function () {
let href = encodeURI(window.location.href);
const decodeChars = (string) => string.replace(/[<>'*+?^${}()|[\]\\]/g, '\\$&');
let redirectTo =
decodeChars(decodeURIComponent(href.match(/post_logout_redirect_uri=(.*?)(&|$)/)[1]));
if (!redirectTo.startsWith(window.location.origin)) {
console.warn("post_logout_redirect_uri has wrong input. You are redirected to /auth/logout.html!");
redirectTo = '/auth/logout.html';
}
window.location.href = redirectTo;
};
</script>
</body>

</html>
</html>
25 changes: 15 additions & 10 deletions website/fiddle/public/auth/logout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -15,30 +16,34 @@
font-size: 50px;
color: #a0a0a0;
}

.fd-container--centered {
text-align: center;
}
.fd-container {

.fd-container {
padding-top: 20px;
}
</style>
<script type="text/javascript">
function login() {
window.location.href = window.location.origin;
window.location.href = '/';
}
</script>
</head>

<body>
<div class="fd-container fd-container--centered">
<div class="fd-col--6 fd-col--shift-3">
<span class="sap-icon--log"></span>
<br />
<div class="fd-container fd-container--centered">
<div class="fd-col--6 fd-col--shift-3">
<span class="sap-icon--log"></span>
<br />
Logout successful
<br />
<br />
<button class="fd-button" onclick="login()">Login again</button>
<br />
<br />
<button class="fd-button" onclick="login()">Login again</button>
</div>
</div>
</div>

</body>

</html>