safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.9.11-incubating changes back to master.

Browse Source
This commit is contained in:
James Muehlner
2017-01-22 12:43:45 -08:00
parent 7219957763 d440bc732d
commit 005f6153f8
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
View File

@@ -85,7 +85,7 @@ CREATE TABLE `guacamole_user` (
`username` varchar(128) NOT NULL, `username` varchar(128) NOT NULL,
`password_hash` binary(32) NOT NULL, `password_hash` binary(32) NOT NULL,
`password_salt` binary(32), `password_salt` binary(32),
`password_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `password_date` datetime NOT NULL,
-- Account disabled/expired status -- Account disabled/expired status
`disabled` boolean NOT NULL DEFAULT 0, `disabled` boolean NOT NULL DEFAULT 0,

5
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/002-create-admin-user.sql
View File

@@ -18,10 +18,11 @@
-- --
-- Create default user "guacadmin" with password "guacadmin" -- Create default user "guacadmin" with password "guacadmin"
INSERT INTO guacamole_user (username, password_hash, password_salt) INSERT INTO guacamole_user (username, password_hash, password_salt, password_date)
VALUES ('guacadmin', VALUES ('guacadmin',
x'CA458A7D494E3BE824F5E1E175A1556C0F8EEF2C2D7DF3633BEC4A29C4411960', -- 'guacadmin' x'CA458A7D494E3BE824F5E1E175A1556C0F8EEF2C2D7DF3633BEC4A29C4411960', -- 'guacadmin'
x'FE24ADC5E11E2B25288D1704ABE67A79E342ECC26064CE69C5B3177795A82264'); x'FE24ADC5E11E2B25288D1704ABE67A79E342ECC26064CE69C5B3177795A82264',
NOW());
-- Grant this user all system permissions -- Grant this user all system permissions
INSERT INTO guacamole_system_permission INSERT INTO guacamole_system_permission

7
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.9.11.sql
View File

@@ -22,7 +22,12 @@
-- --
ALTER TABLE guacamole_user ALTER TABLE guacamole_user
ADD COLUMN password_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP; ADD COLUMN password_date DATETIME;
UPDATE guacamole_user SET password_date = NOW();
ALTER TABLE guacamole_user
MODIFY COLUMN password_date DATETIME NOT NULL;
-- --
-- User password history -- User password history

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql
View File

@@ -126,7 +126,7 @@ CREATE TABLE guacamole_user (
username varchar(128) NOT NULL, username varchar(128) NOT NULL,
password_hash bytea NOT NULL, password_hash bytea NOT NULL,
password_salt bytea, password_salt bytea,
password_date timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP, password_date timestamptz NOT NULL,
-- Account disabled/expired status -- Account disabled/expired status
disabled boolean NOT NULL DEFAULT FALSE, disabled boolean NOT NULL DEFAULT FALSE,

5
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/002-create-admin-user.sql
View File

@@ -19,10 +19,11 @@
-- Create default user "guacadmin" with password "guacadmin" -- Create default user "guacadmin" with password "guacadmin"
INSERT INTO guacamole_user (username, password_hash, password_salt) INSERT INTO guacamole_user (username, password_hash, password_salt, password_date)
VALUES ('guacadmin', VALUES ('guacadmin',
E'\\xCA458A7D494E3BE824F5E1E175A1556C0F8EEF2C2D7DF3633BEC4A29C4411960', -- 'guacadmin' E'\\xCA458A7D494E3BE824F5E1E175A1556C0F8EEF2C2D7DF3633BEC4A29C4411960', -- 'guacadmin'
E'\\xFE24ADC5E11E2B25288D1704ABE67A79E342ECC26064CE69C5B3177795A82264'); E'\\xFE24ADC5E11E2B25288D1704ABE67A79E342ECC26064CE69C5B3177795A82264',
CURRENT_TIMESTAMP);
-- Grant this user all system permissions -- Grant this user all system permissions
INSERT INTO guacamole_system_permission INSERT INTO guacamole_system_permission

7
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.11.sql
View File

@@ -22,7 +22,12 @@
-- --
ALTER TABLE guacamole_user ALTER TABLE guacamole_user
ADD COLUMN password_date timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP; ADD COLUMN password_date timestamptz;
UPDATE guacamole_user SET password_date = CURRENT_TIMESTAMP;
ALTER TABLE guacamole_user
ALTER COLUMN password_date SET NOT NULL;
-- --
-- User password history -- User password history