From b8b81bb57a5fd8dc2ec8e11e84574d240367e009 Mon Sep 17 00:00:00 2001 From: Dominik Frantisek Bucik Date: Tue, 30 Nov 2021 11:52:15 +0100 Subject: [PATCH] refactor: Removed duplicate SQL files --- .../webapp/WEB-INF/classes/db/mysql/acrs.sql | 22 - .../WEB-INF/classes/db/mysql/db_update.sql | 10 - .../WEB-INF/classes/db/mysql/scopes.sql | 39 -- .../webapp/WEB-INF/classes/db/psql/acrs.sql | 12 - .../WEB-INF/classes/db/psql/db_update.sql | 7 - .../classes/db/psql/loading_temp_tables.sql | 73 ---- .../classes/db/psql/psql_database_tables.sql | 384 ------------------ .../webapp/WEB-INF/classes/db/psql/scopes.sql | 35 -- 8 files changed, 582 deletions(-) delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/acrs.sql delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/db_update.sql delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/scopes.sql delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/acrs.sql delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/db_update.sql delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/loading_temp_tables.sql delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/psql_database_tables.sql delete mode 100644 perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/scopes.sql diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/acrs.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/acrs.sql deleted file mode 100644 index 0013f501a..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/acrs.sql +++ /dev/null @@ -1,22 +0,0 @@ -CREATE TABLE IF NOT EXISTS acrs ( - id BIGINT AUTO_INCREMENT, - client_id VARCHAR(2048) NOT NULL, - sub VARCHAR(2048) NOT NULL, - state VARCHAR(2048) NOT NULL, - shib_authn_context_class VARCHAR(2048) NOT NULL, - expiration BIGINT NOT NULL, - PRIMARY KEY (id) -); - -ALTER TABLE acrs MODIFY COLUMN expiration BIGINT; - -CREATE TABLE IF NOT EXISTS device_code_acrs ( - id BIGINT AUTO_INCREMENT, - device_code VARCHAR(2048) NOT NULL, - user_code VARCHAR(2048) NOT NULL, - shib_authn_context_class VARCHAR(2048), - expiration BIGINT NOT NULL, - PRIMARY KEY (id) -); - -ALTER TABLE device_code_acrs MODIFY COLUMN expiration BIGINT; diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/db_update.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/db_update.sql deleted file mode 100644 index 733cc6e7d..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/db_update.sql +++ /dev/null @@ -1,10 +0,0 @@ -ALTER TABLE authentication_holder_request_parameter -MODIFY COLUMN val TEXT; - -CREATE TABLE shedlock( - name VARCHAR(64), - lock_until TIMESTAMP(3) NULL, - locked_at TIMESTAMP(3) NULL, - locked_by VARCHAR(255), - PRIMARY KEY (name) -); diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/scopes.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/scopes.sql deleted file mode 100644 index 15bb8f1ef..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/mysql/scopes.sql +++ /dev/null @@ -1,39 +0,0 @@ --- --- Turn off autocommit and start a transaction so that we can use the temp tables --- - -SET AUTOCOMMIT = 0; - -START TRANSACTION; - -CREATE TEMPORARY TABLE IF NOT EXISTS system_scope_TEMP ( - scope VARCHAR(256), - description VARCHAR(4096), - icon VARCHAR(256), - restricted BOOLEAN, - default_scope BOOLEAN -); --- --- Insert scope information into the temporary tables. --- - -INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope) VALUES - ('openid', 'log in using your identity', 'user', false, true), - ('profile', 'basic profile information', 'list-alt', false, true), - ('email', 'email address', 'envelope', false, true), - ('address', 'physical address', 'home', false, true), - ('phone', 'telephone number', 'bell', false, true), - ('offline_access', 'offline access', 'time', false, false), - ('perun_api', 'calls to Perun API in your roles', 'cog', true, false); - --- --- Merge the temporary scopes safely into the database. This is a two-step process to keep scopes from being created on every startup with a persistent store. --- - -INSERT INTO system_scope (scope, description, icon, restricted, default_scope) - SELECT scope, description, icon, restricted, default_scope FROM system_scope_TEMP - ON DUPLICATE KEY UPDATE system_scope.scope = system_scope.scope; - -COMMIT; - -SET AUTOCOMMIT = 1; diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/acrs.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/acrs.sql deleted file mode 100644 index 96f415140..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/acrs.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE IF NOT EXISTS acrs ( - id BIGINT AUTO_INCREMENT, - client_id VARCHAR(2048) NOT NULL, - sub VARCHAR(2048) NOT NULL, - acr_values VARCHAR(2048) NOT NULL, - state VARCHAR(2048) NOT NULL, - shib_authn_context_class VARCHAR(2048) NOT NULL, - expiration BIGINT NOT NULL, - PRIMARY KEY (id) -); - -ALTER TABLE acrs MODIFY COLUMN expiration BIGINT; diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/db_update.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/db_update.sql deleted file mode 100644 index 5eca832d6..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/db_update.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE shedlock( - name VARCHAR(64), - lock_until TIMESTAMP(3) NULL, - locked_at TIMESTAMP(3) NULL, - locked_by VARCHAR(255), - PRIMARY KEY (name) -); diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/loading_temp_tables.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/loading_temp_tables.sql deleted file mode 100644 index 37b0092e7..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/loading_temp_tables.sql +++ /dev/null @@ -1,73 +0,0 @@ --- --- Temporary tables used during the bootstrapping process to safely load users and clients. --- These are not needed if you're not using the users.sql/clients.sql files to bootstrap the database. --- - -CREATE TEMPORARY TABLE IF NOT EXISTS authorities_TEMP ( - username varchar(50) not null, - authority varchar(50) not null, - constraint ix_authority_TEMP unique (username,authority)); - -CREATE TEMPORARY TABLE IF NOT EXISTS users_TEMP ( - username varchar(50) not null primary key, - password varchar(50) not null, - enabled boolean not null); - -CREATE TEMPORARY TABLE IF NOT EXISTS user_info_TEMP ( - sub VARCHAR(256) not null primary key, - preferred_username VARCHAR(256), - name VARCHAR(256), - given_name VARCHAR(256), - family_name VARCHAR(256), - middle_name VARCHAR(256), - nickname VARCHAR(256), - profile VARCHAR(256), - picture VARCHAR(256), - website VARCHAR(256), - email VARCHAR(256), - email_verified BOOLEAN, - gender VARCHAR(256), - zone_info VARCHAR(256), - locale VARCHAR(256), - phone_number VARCHAR(256), - address_id VARCHAR(256), - updated_time VARCHAR(256), - birthdate VARCHAR(256) -); - -CREATE TEMPORARY TABLE IF NOT EXISTS client_details_TEMP ( - client_description VARCHAR(256), - dynamically_registered BOOLEAN, - id_token_validity_seconds BIGINT, - - client_id VARCHAR(256), - client_secret VARCHAR(2048), - access_token_validity_seconds BIGINT, - refresh_token_validity_seconds BIGINT, - allow_introspection BOOLEAN, - - client_name VARCHAR(256) -); - -CREATE TEMPORARY TABLE IF NOT EXISTS client_scope_TEMP ( - owner_id VARCHAR(256), - scope VARCHAR(2048) -); - -CREATE TEMPORARY TABLE IF NOT EXISTS client_redirect_uri_TEMP ( - owner_id VARCHAR(256), - redirect_uri VARCHAR(2048) -); - -CREATE TEMPORARY TABLE IF NOT EXISTS client_grant_type_TEMP ( - owner_id VARCHAR(256), - grant_type VARCHAR(2000) -); - -CREATE TEMPORARY TABLE IF NOT EXISTS system_scope_TEMP ( - scope VARCHAR(256), - description VARCHAR(4096), - icon VARCHAR(256), - restricted BOOLEAN, - default_scope BOOLEAN -); \ No newline at end of file diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/psql_database_tables.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/psql_database_tables.sql deleted file mode 100644 index bf6c20874..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/psql_database_tables.sql +++ /dev/null @@ -1,384 +0,0 @@ --- --- Tables for OIDC Server functionality, PostgreSQL --- - -CREATE TABLE IF NOT EXISTS access_token ( - id SERIAL PRIMARY KEY, - token_value VARCHAR(4096), - expiration TIMESTAMP, - token_type VARCHAR(256), - refresh_token_id BIGINT, - client_id BIGINT, - auth_holder_id BIGINT, - approved_site_id BIGINT, - UNIQUE(token_value) -); - -CREATE TABLE IF NOT EXISTS access_token_permissions ( - access_token_id BIGINT NOT NULL, - permission_id BIGINT NOT NULL -); - -CREATE TABLE IF NOT EXISTS address ( - id SERIAL PRIMARY KEY, - formatted VARCHAR(256), - street_address VARCHAR(256), - locality VARCHAR(256), - region VARCHAR(256), - postal_code VARCHAR(256), - country VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS approved_site ( - id SERIAL PRIMARY KEY, - user_id VARCHAR(256), - client_id VARCHAR(256), - creation_date TIMESTAMP, - access_date TIMESTAMP, - timeout_date TIMESTAMP, - whitelisted_site_id BIGINT -); - -CREATE TABLE IF NOT EXISTS approved_site_scope ( - owner_id BIGINT, - scope VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS authentication_holder ( - id SERIAL PRIMARY KEY, - user_auth_id BIGINT, - approved BOOLEAN, - redirect_uri VARCHAR(2048), - client_id VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS authentication_holder_authority ( - owner_id BIGINT, - authority VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS authentication_holder_resource_id ( - owner_id BIGINT, - resource_id VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS authentication_holder_response_type ( - owner_id BIGINT, - response_type VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS authentication_holder_extension ( - owner_id BIGINT, - extension VARCHAR(2048), - val VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS authentication_holder_scope ( - owner_id BIGINT, - scope VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS authentication_holder_request_parameter ( - owner_id BIGINT, - param VARCHAR(2048), - val TEXT -); - -CREATE TABLE IF NOT EXISTS saved_user_auth ( - id SERIAL PRIMARY KEY, - name VARCHAR(1024), - authenticated BOOLEAN, - acr VARCHAR(1024) -); - -CREATE TABLE IF NOT EXISTS saved_user_auth_authority ( - owner_id BIGINT, - authority VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS client_authority ( - owner_id BIGINT, - authority VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS authorization_code ( - id SERIAL PRIMARY KEY, - code VARCHAR(256), - auth_holder_id BIGINT, - expiration TIMESTAMP -); - -CREATE TABLE IF NOT EXISTS client_grant_type ( - owner_id BIGINT, - grant_type VARCHAR(2000) -); - -CREATE TABLE IF NOT EXISTS client_response_type ( - owner_id BIGINT, - response_type VARCHAR(2000) -); - -CREATE TABLE IF NOT EXISTS blacklisted_site ( - id SERIAL PRIMARY KEY, - uri VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS client_details ( - id SERIAL PRIMARY KEY, - - client_description VARCHAR(1024), - reuse_refresh_tokens BOOLEAN DEFAULT true NOT NULL, - dynamically_registered BOOLEAN DEFAULT false NOT NULL, - allow_introspection BOOLEAN DEFAULT false NOT NULL, - id_token_validity_seconds BIGINT DEFAULT 600 NOT NULL, - device_code_validity_seconds BIGINT, - - client_id VARCHAR(256), - client_secret VARCHAR(2048), - access_token_validity_seconds BIGINT, - refresh_token_validity_seconds BIGINT, - - application_type VARCHAR(256), - client_name VARCHAR(256), - token_endpoint_auth_method VARCHAR(256), - subject_type VARCHAR(256), - - logo_uri VARCHAR(2048), - policy_uri VARCHAR(2048), - client_uri VARCHAR(2048), - tos_uri VARCHAR(2048), - - jwks_uri VARCHAR(2048), - jwks VARCHAR(8192), - sector_identifier_uri VARCHAR(2048), - - request_object_signing_alg VARCHAR(256), - - user_info_signed_response_alg VARCHAR(256), - user_info_encrypted_response_alg VARCHAR(256), - user_info_encrypted_response_enc VARCHAR(256), - - id_token_signed_response_alg VARCHAR(256), - id_token_encrypted_response_alg VARCHAR(256), - id_token_encrypted_response_enc VARCHAR(256), - - token_endpoint_auth_signing_alg VARCHAR(256), - - default_max_age BIGINT, - require_auth_time BOOLEAN, - created_at TIMESTAMP, - initiate_login_uri VARCHAR(2048), - clear_access_tokens_on_refresh BOOLEAN DEFAULT true NOT NULL, - - software_statement VARCHAR(4096), - software_id VARCHAR(2048), - software_version VARCHAR(2048), - - code_challenge_method VARCHAR(256), - - UNIQUE (client_id) -); - -CREATE TABLE IF NOT EXISTS client_request_uri ( - owner_id BIGINT, - request_uri VARCHAR(2000) -); - -CREATE TABLE IF NOT EXISTS client_post_logout_redirect_uri ( - owner_id BIGINT, - post_logout_redirect_uri VARCHAR(2000) -); - -CREATE TABLE IF NOT EXISTS client_default_acr_value ( - owner_id BIGINT, - default_acr_value VARCHAR(2000) -); - -CREATE TABLE IF NOT EXISTS client_contact ( - owner_id BIGINT, - contact VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS client_redirect_uri ( - owner_id BIGINT, - redirect_uri VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS client_claims_redirect_uri ( - owner_id BIGINT, - redirect_uri VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS refresh_token ( - id SERIAL PRIMARY KEY, - token_value VARCHAR(4096), - expiration TIMESTAMP, - auth_holder_id BIGINT, - client_id BIGINT -); - -CREATE TABLE IF NOT EXISTS client_resource ( - owner_id BIGINT, - resource_id VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS client_scope ( - owner_id BIGINT, - scope VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS token_scope ( - owner_id BIGINT, - scope VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS system_scope ( - id SERIAL PRIMARY KEY, - scope VARCHAR(256) NOT NULL, - description VARCHAR(4096), - icon VARCHAR(256), - restricted BOOLEAN DEFAULT false NOT NULL, - default_scope BOOLEAN DEFAULT false NOT NULL, - UNIQUE (scope) -); - -CREATE TABLE IF NOT EXISTS user_info ( - id SERIAL PRIMARY KEY, - sub VARCHAR(256), - preferred_username VARCHAR(256), - name VARCHAR(256), - given_name VARCHAR(256), - family_name VARCHAR(256), - middle_name VARCHAR(256), - nickname VARCHAR(256), - profile VARCHAR(256), - picture VARCHAR(256), - website VARCHAR(256), - email VARCHAR(256), - email_verified BOOLEAN, - gender VARCHAR(256), - zone_info VARCHAR(256), - locale VARCHAR(256), - phone_number VARCHAR(256), - phone_number_verified BOOLEAN, - address_id VARCHAR(256), - updated_time VARCHAR(256), - birthdate VARCHAR(256), - src VARCHAR(4096) -); - -CREATE TABLE IF NOT EXISTS whitelisted_site ( - id SERIAL PRIMARY KEY, - creator_user_id VARCHAR(256), - client_id VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS whitelisted_site_scope ( - owner_id BIGINT, - scope VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS pairwise_identifier ( - id SERIAL PRIMARY KEY, - identifier VARCHAR(256), - sub VARCHAR(256), - sector_identifier VARCHAR(2048) -); - -CREATE TABLE IF NOT EXISTS resource_set ( - id SERIAL PRIMARY KEY, - name VARCHAR(1024) NOT NULL, - uri VARCHAR(1024), - icon_uri VARCHAR(1024), - rs_type VARCHAR(256), - owner VARCHAR(256) NOT NULL, - client_id VARCHAR(256) -); - -CREATE TABLE IF NOT EXISTS resource_set_scope ( - owner_id BIGINT NOT NULL, - scope VARCHAR(256) NOT NULL -); - -CREATE TABLE IF NOT EXISTS permission_ticket ( - id SERIAL PRIMARY KEY, - ticket VARCHAR(256) NOT NULL, - permission_id BIGINT NOT NULL, - expiration TIMESTAMP -); - -CREATE TABLE IF NOT EXISTS permission ( - id SERIAL PRIMARY KEY, - resource_set_id BIGINT -); - -CREATE TABLE IF NOT EXISTS permission_scope ( - owner_id BIGINT NOT NULL, - scope VARCHAR(256) NOT NULL -); - -CREATE TABLE IF NOT EXISTS claim ( - id SERIAL PRIMARY KEY, - name VARCHAR(256), - friendly_name VARCHAR(1024), - claim_type VARCHAR(1024), - claim_value VARCHAR(1024) -); - -CREATE TABLE IF NOT EXISTS claim_to_policy ( - policy_id BIGINT NOT NULL, - claim_id BIGINT NOT NULL -); - -CREATE TABLE IF NOT EXISTS claim_to_permission_ticket ( - permission_ticket_id BIGINT NOT NULL, - claim_id BIGINT NOT NULL -); - -CREATE TABLE IF NOT EXISTS policy ( - id SERIAL PRIMARY KEY, - name VARCHAR(1024), - resource_set_id BIGINT -); - -CREATE TABLE IF NOT EXISTS policy_scope ( - owner_id BIGINT NOT NULL, - scope VARCHAR(256) NOT NULL -); - -CREATE TABLE IF NOT EXISTS claim_token_format ( - owner_id BIGINT NOT NULL, - claim_token_format VARCHAR(1024) -); - -CREATE TABLE IF NOT EXISTS claim_issuer ( - owner_id BIGINT NOT NULL, - issuer VARCHAR(1024) -); - -CREATE TABLE IF NOT EXISTS saved_registered_client ( - id SERIAL PRIMARY KEY, - issuer VARCHAR(1024), - registered_client VARCHAR(8192) -); - -CREATE TABLE IF NOT EXISTS device_code ( - id BIGSERIAL PRIMARY KEY, - device_code VARCHAR(1024), - user_code VARCHAR(1024), - expiration TIMESTAMP NULL, - client_id VARCHAR(256), - approved BOOLEAN, - auth_holder_id BIGINT -); - -CREATE TABLE IF NOT EXISTS device_code_scope ( - owner_id BIGINT NOT NULL, - scope VARCHAR(256) NOT NULL -); - -CREATE TABLE IF NOT EXISTS device_code_request_parameter ( - owner_id BIGINT, - param VARCHAR(2048), - val VARCHAR(2048) -); diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/scopes.sql b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/scopes.sql deleted file mode 100644 index e316b04db..000000000 --- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/classes/db/psql/scopes.sql +++ /dev/null @@ -1,35 +0,0 @@ --- --- Turn off autocommit and start a transaction so that we can use the temp tables --- - ---SET AUTOCOMMIT = OFF; - -START TRANSACTION; - --- --- Insert scope information into the temporary tables. --- - -INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope) VALUES - ('openid', 'log in using your identity', 'user', false, true), - ('profile', 'basic profile information', 'list-alt', false, true), - ('email', 'email address', 'envelope', false, true), - ('address', 'physical address', 'home', false, true), - ('phone', 'telephone number', 'bell', false, true), - ('offline_access', 'offline access', 'time', false, false), - ('perun_api', 'calls to Perun API in your roles', 'cog', true, false) - ; - --- --- Merge the temporary scopes safely into the database. This is a two-step process to keep scopes from being created on every startup with a persistent store. --- - -INSERT INTO system_scope (scope, description, icon, restricted, default_scope) - SELECT scope, description, icon, restricted, default_scope FROM system_scope_TEMP - ON CONFLICT(scope) - DO NOTHING; - -COMMIT; - ---SET AUTOCOMMIT = ON; -