gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-29 19:03:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

webauthn has been implemented in an extension

Browse Source
This commit is contained in:
Uwe Steinmann 2023-10-16 12:53:57 +02:00
parent 001b60184c
commit ad2e735687
7 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install/create_tables-innodb.sql
View File

@ -70,7 +70,6 @@ CREATE TABLE `tblUsers` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`login` varchar(50) DEFAULT NULL, `login` varchar(50) DEFAULT NULL,
`pwd` varchar(255) DEFAULT NULL, `pwd` varchar(255) DEFAULT NULL,
`webauthn` text DEFAULT NULL,
`secret` varchar(50) DEFAULT NULL, `secret` varchar(50) DEFAULT NULL,
`fullName` varchar(100) DEFAULT NULL, `fullName` varchar(100) DEFAULT NULL,
`email` varchar(70) DEFAULT NULL, `email` varchar(70) DEFAULT NULL,

1
install/create_tables-postgres.sql
View File

@ -65,7 +65,6 @@ CREATE TABLE "tblUsers" (
"id" SERIAL UNIQUE, "id" SERIAL UNIQUE,
"login" varchar(50) default NULL, "login" varchar(50) default NULL,
"pwd" varchar(255) default NULL, "pwd" varchar(255) default NULL,
"webauthn" text default NULL,
"secret" varchar(50) default NULL, "secret" varchar(50) default NULL,
"fullName" varchar(100) default NULL, "fullName" varchar(100) default NULL,
"email" varchar(70) default NULL, "email" varchar(70) default NULL,

1
install/create_tables-sqlite3.sql
View File

@ -66,7 +66,6 @@ CREATE TABLE `tblUsers` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT, `id` INTEGER PRIMARY KEY AUTOINCREMENT,
`login` varchar(50) default NULL, `login` varchar(50) default NULL,
`pwd` varchar(255) default NULL, `pwd` varchar(255) default NULL,
`webauthn` TEXT default NULL,
`secret` varchar(50) default NULL, `secret` varchar(50) default NULL,
`fullName` varchar(100) default NULL, `fullName` varchar(100) default NULL,
`email` varchar(70) default NULL, `email` varchar(70) default NULL,

2
install/update-6.1.0/update-postgres.sql
View File

@ -8,8 +8,6 @@ ALTER TABLE "tblUserPasswordHistory" ALTER COLUMN "pwd" varchar(255) DEFAULT NUL
ALTER TABLE "tblUserPasswordRequest" ALTER COLUMN "hash" varchar(255) DEFAULT NULL; ALTER TABLE "tblUserPasswordRequest" ALTER COLUMN "hash" varchar(255) DEFAULT NULL;
ALTER TABLE "tblUsers" ADD COLUMN "webauthn" TYPE text DEFAULT NULL;
ALTER TABLE "tblUsers" ADD COLUMN "disabledUntil" TYPE TIMESTAMP DEFAULT NULL; ALTER TABLE "tblUsers" ADD COLUMN "disabledUntil" TYPE TIMESTAMP DEFAULT NULL;
ALTER TABLE "tblDocuments" ADD COLUMN "startdate" TIMESTAMP default NULL; ALTER TABLE "tblDocuments" ADD COLUMN "startdate" TIMESTAMP default NULL;

2
install/update-6.1.0/update-sqlite3.sql
View File

@ -38,8 +38,6 @@ DROP TABLE `tblUsers`;
ALTER TABLE `new_tblUsers` RENAME TO `tblUsers`; ALTER TABLE `new_tblUsers` RENAME TO `tblUsers`;
ALTER TABLE `tblUsers` ADD COLUMN `webauthn` TEXT DEFAULT NULL;
ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` TEXT DEFAULT NULL; ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` TEXT DEFAULT NULL;
CREATE TABLE `new_tblUserPasswordRequest` ( CREATE TABLE `new_tblUserPasswordRequest` (

2
install/update-6.1.0/update.sql
View File

@ -8,8 +8,6 @@ ALTER TABLE `tblUserPasswordHistory` CHANGE `pwd` `pwd` varchar(255) DEFAULT NUL
ALTER TABLE `tblUserPasswordRequest` CHANGE `hash` `hash` varchar(255) DEFAULT NULL; ALTER TABLE `tblUserPasswordRequest` CHANGE `hash` `hash` varchar(255) DEFAULT NULL;
ALTER TABLE `tblUsers` ADD COLUMN `webauthn` text DEFAULT NULL AFTER `pwd`;
ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` datetime DEFAULT NULL AFTER `disabled`; ALTER TABLE `tblUsers` ADD COLUMN `disabledUntil` datetime DEFAULT NULL AFTER `disabled`;
ALTER TABLE `tblDocuments` ADD COLUMN `enddate` datetime DEFAULT NULL AFTER `sequence`; ALTER TABLE `tblDocuments` ADD COLUMN `enddate` datetime DEFAULT NULL AFTER `sequence`;

14
op/op.Login.php
View File

@ -28,7 +28,6 @@ include("../inc/inc.ClassSession.php");
include("../inc/inc.DBInit.php"); include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php"); include("../inc/inc.ClassUI.php");
include("../inc/inc.ClassController.php"); include("../inc/inc.ClassController.php");
require_once("../inc/inc.WebAuthn.php");
include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
@ -92,25 +91,12 @@ $controller->setParam('sesstheme', $sesstheme);
$controller->setParam('referuri', $referuri); $controller->setParam('referuri', $referuri);
$controller->setParam('session', $session); $controller->setParam('session', $session);
$controller->setParam('authenticator', $authenticator); $controller->setParam('authenticator', $authenticator);
$action = !empty($_POST['action']) ? $_POST['action'] : '';
switch($action) {
/* preparelogin() and login() are both called by ajax */
case 'preparelogin':
$controller->preparelogin();
exit();
break;
case 'login':
$controller->login();
exit();
break;
default:
if(!$controller()) { if(!$controller()) {
$session = null; $session = null;
add_log_line("login failed", PEAR_LOG_ERR); add_log_line("login failed", PEAR_LOG_ERR);
_printMessage(getMLText($controller->getErrorMsg()), getMLText($controller->getErrorMsg())."\n"); _printMessage(getMLText($controller->getErrorMsg()), getMLText($controller->getErrorMsg())."\n");
exit; exit;
} }
}
$user = $controller->getUser(); $user = $controller->getUser();