Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • perun/perun-proxyidp/simplesamlphp-module-privacyidea
1 result
Show changes
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ 0e09cd0d
## [5.5.1](https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-privacyidea/compare/v5.5.0...v5.5.1) (2023-07-18)
### Bug Fixes
* mfa skipping after logout ([419ce58](https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-privacyidea/commit/419ce58781f613e45dd5dcc5ccf4f492dc9a4fa0))
# [5.5.0](https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-privacyidea/compare/v5.4.2...v5.5.0) (2023-06-27) # [5.5.0](https://gitlab.ics.muni.cz/perun-proxy-aai/simplesamlphp/simplesamlphp-module-privacyidea/compare/v5.4.2...v5.5.0) (2023-06-27)
......
lib/Auth/Utils.php
View file @ 0e09cd0d
...@@ -188,7 +188,7 @@ class Utils ...@@ -188,7 +188,7 @@ class Utils
public static function handleLogout() public static function handleLogout()
{ {
Logger::debug('privacyIDEA: Logout handler called. Removing SSO data.'); Logger::debug('privacyIDEA: Logout handler called. Removing SSO data.');
Session::getSessionFromRequest()->deleteData('privacyidea:privacyidea:sso', '2FA-success'); Session::getSessionFromRequest()->deleteData('privacyidea:privacyidea', '2FA-success');
} }
/** /**
......
www/js/loginform.js
View file @ 0e09cd0d
...@@ -119,7 +119,7 @@ function doWebAuthn() { ...@@ -119,7 +119,7 @@ function doWebAuthn() {
enable("useWebAuthnButton"); enable("useWebAuthnButton");
setMessage(t("webauthn_insecure_context")); setMessage(t("webauthn_insecure_context"));
console.log( console.log(
"Insecure context detected: Aborting Web Authn authentication!" "Insecure context detected: Aborting Web Authn authentication!",
); );
fallbackToOTP(); fallbackToOTP();
return; return;
......
www/js/pi-webauthn.js
View file @ 0e09cd0d
...@@ -172,7 +172,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null; ...@@ -172,7 +172,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null;
uint6ToB64((nUint24 >>> 18) & 63), uint6ToB64((nUint24 >>> 18) & 63),
uint6ToB64((nUint24 >>> 12) & 63), uint6ToB64((nUint24 >>> 12) & 63),
uint6ToB64((nUint24 >>> 6) & 63), uint6ToB64((nUint24 >>> 6) & 63),
uint6ToB64(nUint24 & 63) uint6ToB64(nUint24 & 63),
); );
nUint24 = 0; nUint24 = 0;
} }
...@@ -198,7 +198,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null; ...@@ -198,7 +198,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null;
sBase64 sBase64
.replace(/-/g, "+") .replace(/-/g, "+")
.replace(/_/g, "/") .replace(/_/g, "/")
.padEnd((sBase64.length | 3) + 1, "=") .padEnd((sBase64.length | 3) + 1, "="),
); );
}; };
...@@ -264,7 +264,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null; ...@@ -264,7 +264,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null;
128 128
: nPart > 191 && nPart < 224 && nIdx + 1 < nLen : nPart > 191 && nPart < 224 && nIdx + 1 < nLen
? ((nPart - 192) << 6) + aBytes[++nIdx] - 128 ? ((nPart - 192) << 6) + aBytes[++nIdx] - 128
: nPart : nPart,
); );
} }
...@@ -409,7 +409,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null; ...@@ -409,7 +409,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null;
}; };
if (webAuthnRegisterRequest.alternativeAlgorithm) { if (webAuthnRegisterRequest.alternativeAlgorithm) {
publicKeyCredentialCreationOptions.pubKeyCredParams.push( publicKeyCredentialCreationOptions.pubKeyCredParams.push(
webAuthnRegisterRequest.alternativeAlgorithm webAuthnRegisterRequest.alternativeAlgorithm,
); );
} }
if (webAuthnRegisterRequest.authenticatorSelection) { if (webAuthnRegisterRequest.authenticatorSelection) {
...@@ -442,7 +442,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null; ...@@ -442,7 +442,7 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null;
) { ) {
webAuthnRegisterResponse.registrationclientextensions = webAuthnRegisterResponse.registrationclientextensions =
webAuthnBase64EncArr( webAuthnBase64EncArr(
strToUtf8Arr(JSON.stringify(clientExtensionResults)) strToUtf8Arr(JSON.stringify(clientExtensionResults)),
); );
} }
...@@ -509,20 +509,20 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null; ...@@ -509,20 +509,20 @@ var pi_webauthn = navigator.credentials ? window.pi_webauthn || {} : null;
clientdata: webAuthnBase64EncArr(assertion.response.clientDataJSON), clientdata: webAuthnBase64EncArr(assertion.response.clientDataJSON),
signaturedata: webAuthnBase64EncArr(assertion.response.signature), signaturedata: webAuthnBase64EncArr(assertion.response.signature),
authenticatordata: webAuthnBase64EncArr( authenticatordata: webAuthnBase64EncArr(
assertion.response.authenticatorData assertion.response.authenticatorData,
), ),
}; };
if (assertion.response.userHandle) { if (assertion.response.userHandle) {
webAuthnSignResponse.userhandle = utf8ArrToStr( webAuthnSignResponse.userhandle = utf8ArrToStr(
assertion.response.userHandle assertion.response.userHandle,
); );
} }
if (assertion.response.assertionClientExtensions) { if (assertion.response.assertionClientExtensions) {
webAuthnSignResponse.assertionclientextensions = webAuthnBase64EncArr( webAuthnSignResponse.assertionclientextensions = webAuthnBase64EncArr(
strToUtf8Arr( strToUtf8Arr(
JSON.stringify(assertion.response.assertionClientExtensions) JSON.stringify(assertion.response.assertionClientExtensions),
) ),
); );
} }
......
www/js/u2f-api.js
View file @ 0e09cd0d
...@@ -303,7 +303,7 @@ u2f.formatSignRequest_ = function ( ...@@ -303,7 +303,7 @@ u2f.formatSignRequest_ = function (
challenge, challenge,
registeredKeys, registeredKeys,
timeoutSeconds, timeoutSeconds,
reqId reqId,
) { ) {
if (js_api_version === undefined || js_api_version < 1.1) { if (js_api_version === undefined || js_api_version < 1.1) {
// Adapt request to the 1.0 JS API // Adapt request to the 1.0 JS API
...@@ -348,7 +348,7 @@ u2f.formatRegisterRequest_ = function ( ...@@ -348,7 +348,7 @@ u2f.formatRegisterRequest_ = function (
registeredKeys, registeredKeys,
registerRequests, registerRequests,
timeoutSeconds, timeoutSeconds,
reqId reqId,
) { ) {
if (js_api_version === undefined || js_api_version < 1.1) { if (js_api_version === undefined || js_api_version < 1.1) {
// Adapt request to the 1.0 JS API // Adapt request to the 1.0 JS API
...@@ -401,7 +401,7 @@ u2f.WrappedChromeRuntimePort_.prototype.postMessage = function (message) { ...@@ -401,7 +401,7 @@ u2f.WrappedChromeRuntimePort_.prototype.postMessage = function (message) {
*/ */
u2f.WrappedChromeRuntimePort_.prototype.addEventListener = function ( u2f.WrappedChromeRuntimePort_.prototype.addEventListener = function (
eventName, eventName,
handler handler,
) { ) {
var name = eventName.toLowerCase(); var name = eventName.toLowerCase();
if (name == "message" || name == "onmessage") { if (name == "message" || name == "onmessage") {
...@@ -456,7 +456,7 @@ u2f.WrappedAuthenticatorPort_.prototype.getPortType = function () { ...@@ -456,7 +456,7 @@ u2f.WrappedAuthenticatorPort_.prototype.getPortType = function () {
*/ */
u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function ( u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function (
eventName, eventName,
handler handler,
) { ) {
var name = eventName.toLowerCase(); var name = eventName.toLowerCase();
if (name == "message") { if (name == "message") {
...@@ -466,7 +466,7 @@ u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function ( ...@@ -466,7 +466,7 @@ u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function (
window.addEventListener( window.addEventListener(
"message", "message",
self.onRequestUpdate_.bind(self, handler), self.onRequestUpdate_.bind(self, handler),
false false,
); );
} else { } else {
console.error("WrappedAuthenticatorPort only supports message"); console.error("WrappedAuthenticatorPort only supports message");
...@@ -481,7 +481,7 @@ u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function ( ...@@ -481,7 +481,7 @@ u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function (
*/ */
u2f.WrappedAuthenticatorPort_.prototype.onRequestUpdate_ = function ( u2f.WrappedAuthenticatorPort_.prototype.onRequestUpdate_ = function (
callback, callback,
message message,
) { ) {
var messageObject = JSON.parse(message.data); var messageObject = JSON.parse(message.data);
var intentUrl = messageObject["intentURL"]; var intentUrl = messageObject["intentURL"];
...@@ -638,7 +638,7 @@ u2f.getPortSingleton_ = function (callback) { ...@@ -638,7 +638,7 @@ u2f.getPortSingleton_ = function (callback) {
"message", "message",
/** /**
* @type {function(Event)} * @type {function(Event)}
*/ (u2f.responseHandler_) */ (u2f.responseHandler_),
); );
// Careful, here be async callbacks. Maybe. // Careful, here be async callbacks. Maybe.
...@@ -686,7 +686,7 @@ u2f.sign = function ( ...@@ -686,7 +686,7 @@ u2f.sign = function (
challenge, challenge,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
) { ) {
if (js_api_version === undefined) { if (js_api_version === undefined) {
// Send a message to get the extension to JS API version, then send the actual sign request. // Send a message to get the extension to JS API version, then send the actual sign request.
...@@ -701,7 +701,7 @@ u2f.sign = function ( ...@@ -701,7 +701,7 @@ u2f.sign = function (
challenge, challenge,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
); );
}); });
} else { } else {
...@@ -711,7 +711,7 @@ u2f.sign = function ( ...@@ -711,7 +711,7 @@ u2f.sign = function (
challenge, challenge,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
); );
} }
}; };
...@@ -730,7 +730,7 @@ u2f.sendSignRequest = function ( ...@@ -730,7 +730,7 @@ u2f.sendSignRequest = function (
challenge, challenge,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
) { ) {
u2f.getPortSingleton_(function (port) { u2f.getPortSingleton_(function (port) {
var reqId = ++u2f.reqCounter_; var reqId = ++u2f.reqCounter_;
...@@ -744,7 +744,7 @@ u2f.sendSignRequest = function ( ...@@ -744,7 +744,7 @@ u2f.sendSignRequest = function (
challenge, challenge,
registeredKeys, registeredKeys,
timeoutSeconds, timeoutSeconds,
reqId reqId,
); );
port.postMessage(req); port.postMessage(req);
}); });
...@@ -768,7 +768,7 @@ u2f.register = function ( ...@@ -768,7 +768,7 @@ u2f.register = function (
registerRequests, registerRequests,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
) { ) {
if (js_api_version === undefined) { if (js_api_version === undefined) {
// Send a message to get the extension to JS API version, then send the actual register request. // Send a message to get the extension to JS API version, then send the actual register request.
...@@ -783,7 +783,7 @@ u2f.register = function ( ...@@ -783,7 +783,7 @@ u2f.register = function (
registerRequests, registerRequests,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
); );
}); });
} else { } else {
...@@ -793,7 +793,7 @@ u2f.register = function ( ...@@ -793,7 +793,7 @@ u2f.register = function (
registerRequests, registerRequests,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
); );
} }
}; };
...@@ -813,7 +813,7 @@ u2f.sendRegisterRequest = function ( ...@@ -813,7 +813,7 @@ u2f.sendRegisterRequest = function (
registerRequests, registerRequests,
registeredKeys, registeredKeys,
callback, callback,
opt_timeoutSeconds opt_timeoutSeconds,
) { ) {
u2f.getPortSingleton_(function (port) { u2f.getPortSingleton_(function (port) {
var reqId = ++u2f.reqCounter_; var reqId = ++u2f.reqCounter_;
...@@ -827,7 +827,7 @@ u2f.sendRegisterRequest = function ( ...@@ -827,7 +827,7 @@ u2f.sendRegisterRequest = function (
registeredKeys, registeredKeys,
registerRequests, registerRequests,
timeoutSeconds, timeoutSeconds,
reqId reqId,
); );
port.postMessage(req); port.postMessage(req);
}); });
......