From 98b8810fe2ca5d760cb8bcec3b47a2ea155b375d Mon Sep 17 00:00:00 2001 From: skavanagh Date: Sun, 9 Dec 2018 19:55:37 -0500 Subject: [PATCH] Renamed to Bastillion --- README.md | 83 +++++++--------- pom.xml | 8 +- .../bastillion}/common/db/DBInitServlet.java | 21 +++-- .../bastillion}/common/filter/AuthFilter.java | 9 +- .../bastillion}/common/util/AppConfig.java | 14 +-- .../bastillion}/common/util/AuthUtil.java | 4 +- .../manage/control/AuthKeysKtrl.java | 21 +++-- .../bastillion}/manage/control/LoginKtrl.java | 18 ++-- .../bastillion}/manage/control/OTPKtrl.java | 14 +-- .../manage/control/ProfileKtrl.java | 8 +- .../manage/control/ProfileSystemsKtrl.java | 14 +-- .../manage/control/ProfileUsersKtrl.java | 14 +-- .../manage/control/ScriptKtrl.java | 10 +- .../manage/control/SecureShellKtrl.java | 13 +-- .../manage/control/SessionAuditKtrl.java | 16 ++-- .../manage/control/SystemKtrl.java | 89 +++++++++--------- .../manage/control/UploadAndPushKtrl.java | 17 ++-- .../manage/control/UserSettingsKtrl.java | 41 ++++++-- .../bastillion}/manage/control/UsersKtrl.java | 36 ++++--- .../bastillion}/manage/db/AuthDB.java | 12 +-- .../bastillion}/manage/db/PrivateKeyDB.java | 9 +- .../bastillion}/manage/db/ProfileDB.java | 8 +- .../manage/db/ProfileSystemsDB.java | 7 +- .../bastillion}/manage/db/PublicKeyDB.java | 10 +- .../bastillion}/manage/db/ScriptDB.java | 9 +- .../bastillion}/manage/db/SessionAuditDB.java | 9 +- .../bastillion}/manage/db/SystemDB.java | 8 +- .../bastillion}/manage/db/SystemStatusDB.java | 13 ++- .../bastillion}/manage/db/UserDB.java | 12 +-- .../bastillion}/manage/db/UserProfileDB.java | 6 +- .../bastillion}/manage/db/UserThemeDB.java | 6 +- .../manage/model/ApplicationKey.java | 2 +- .../manage/model/AuditWrapper.java | 2 +- .../bastillion}/manage/model/Auth.java | 2 +- .../bastillion}/manage/model/HostSystem.java | 2 +- .../bastillion}/manage/model/Profile.java | 2 +- .../bastillion}/manage/model/PublicKey.java | 2 +- .../bastillion}/manage/model/SchSession.java | 2 +- .../bastillion}/manage/model/Script.java | 2 +- .../manage/model/SessionAudit.java | 2 +- .../manage/model/SessionOutput.java | 2 +- .../bastillion}/manage/model/SortedSet.java | 2 +- .../bastillion}/manage/model/User.java | 2 +- .../manage/model/UserSchSessions.java | 2 +- .../manage/model/UserSessionsOutput.java | 2 +- .../manage/model/UserSettings.java | 2 +- .../socket/GetHttpSessionConfigurator.java | 2 +- .../manage/socket/SecureShellWS.java | 18 ++-- .../manage/task/SecureShellTask.java | 7 +- .../manage/task/SentOutputTask.java | 11 ++- .../bastillion}/manage/util/DBUtils.java | 2 +- .../bastillion}/manage/util/DSPool.java | 4 +- .../manage/util/EncryptionUtil.java | 28 +++++- .../manage/util/ExternalAuthUtil.java | 16 ++-- .../bastillion}/manage/util/KeyStoreUtil.java | 7 +- .../bastillion}/manage/util/OTPUtil.java | 2 +- .../bastillion}/manage/util/PasswordUtil.java | 4 +- .../manage/util/RefreshAuthKeyUtil.java | 4 +- .../bastillion}/manage/util/SSHUtil.java | 14 +-- .../manage/util/SessionOutputSerializer.java | 5 +- .../manage/util/SessionOutputUtil.java | 16 ++-- ...properties => BastillionConfig.properties} | 8 +- src/main/resources/VERSION.txt | 2 +- src/main/resources/jaas.conf | 8 +- src/main/resources/log4j2.xml | 6 +- src/main/webapp/WEB-INF/web.xml | 2 +- .../_res/css/{keybox.css => bastillion.css} | 0 src/main/webapp/_res/inc/header.html | 4 +- src/main/webapp/_res/inc/navigation.html | 8 +- src/main/webapp/admin/menu.html | 6 +- src/main/webapp/admin/secure_shell.html | 8 +- src/main/webapp/admin/two-factor_otp.html | 8 +- src/main/webapp/admin/upload.html | 2 +- src/main/webapp/admin/upload_result.html | 2 +- src/main/webapp/admin/user_settings.html | 17 +++- src/main/webapp/admin/view_keys.html | 12 +-- src/main/webapp/admin/view_scripts.html | 4 +- src/main/webapp/admin/view_systems.html | 12 +-- src/main/webapp/error.html | 6 +- src/main/webapp/img/bastillion.ico | Bin 0 -> 7790 bytes src/main/webapp/img/bastillion_100x100.png | Bin 0 -> 2917 bytes src/main/webapp/img/bastillion_200x200.png | Bin 0 -> 6301 bytes src/main/webapp/img/bastillion_40x40.png | Bin 0 -> 1664 bytes src/main/webapp/img/keybox.ico | Bin 3006 -> 0 bytes src/main/webapp/img/keybox_100x100.png | Bin 2560 -> 0 bytes src/main/webapp/img/keybox_200x200.png | Bin 4488 -> 0 bytes src/main/webapp/img/keybox_40x40.png | Bin 1509 -> 0 bytes src/main/webapp/index.html | 2 +- src/main/webapp/login.html | 6 +- src/main/webapp/manage/view_keys.html | 50 +++++----- .../webapp/manage/view_profile_systems.html | 10 +- .../webapp/manage/view_profile_users.html | 18 ++-- src/main/webapp/manage/view_profiles.html | 8 +- src/main/webapp/manage/view_sessions.html | 20 ++-- src/main/webapp/manage/view_systems.html | 14 +-- src/main/webapp/manage/view_terms.html | 6 +- src/main/webapp/manage/view_users.html | 26 ++--- 97 files changed, 536 insertions(+), 468 deletions(-) rename src/main/java/{com/keybox => io/bastillion}/common/db/DBInitServlet.java (94%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/common/filter/AuthFilter.java (96%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/common/util/AppConfig.java (93%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/common/util/AuthUtil.java (99%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/AuthKeysKtrl.java (96%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/LoginKtrl.java (92%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/OTPKtrl.java (89%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/ProfileKtrl.java (93%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/ProfileSystemsKtrl.java (90%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/ProfileUsersKtrl.java (90%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/ScriptKtrl.java (95%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/SecureShellKtrl.java (97%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/SessionAuditKtrl.java (91%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/SystemKtrl.java (59%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/UploadAndPushKtrl.java (96%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/UserSettingsKtrl.java (78%) rename src/main/java/{com/keybox => io/bastillion}/manage/control/UsersKtrl.java (81%) rename src/main/java/{com/keybox => io/bastillion}/manage/db/AuthDB.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/PrivateKeyDB.java (94%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/ProfileDB.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/ProfileSystemsDB.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/PublicKeyDB.java (99%) rename src/main/java/{com/keybox => io/bastillion}/manage/db/ScriptDB.java (97%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/SessionAuditDB.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/db/SystemDB.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/SystemStatusDB.java (97%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/UserDB.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/UserProfileDB.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/db/UserThemeDB.java (97%) rename src/main/java/{com/keybox => io/bastillion}/manage/model/ApplicationKey.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/model/AuditWrapper.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/model/Auth.java (99%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/HostSystem.java (99%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/Profile.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/PublicKey.java (99%) rename src/main/java/{com/keybox => io/bastillion}/manage/model/SchSession.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/Script.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/SessionAudit.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/model/SessionOutput.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/SortedSet.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/User.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/model/UserSchSessions.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/model/UserSessionsOutput.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/model/UserSettings.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/socket/GetHttpSessionConfigurator.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/socket/SecureShellWS.java (94%) rename src/main/java/{com/keybox => io/bastillion}/manage/task/SecureShellTask.java (95%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/task/SentOutputTask.java (92%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/util/DBUtils.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/util/DSPool.java (97%) rename src/main/java/{com/keybox => io/bastillion}/manage/util/EncryptionUtil.java (89%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/util/ExternalAuthUtil.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/util/KeyStoreUtil.java (97%) rename src/main/java/{com/keybox => io/bastillion}/manage/util/OTPUtil.java (99%) rename src/main/java/{com/keybox => io/bastillion}/manage/util/PasswordUtil.java (96%) rename src/main/java/{com/keybox => io/bastillion}/manage/util/RefreshAuthKeyUtil.java (98%) rename src/main/java/{com/keybox => io/bastillion}/manage/util/SSHUtil.java (98%) mode change 100755 => 100644 rename src/main/java/{com/keybox => io/bastillion}/manage/util/SessionOutputSerializer.java (97%) rename src/main/java/{com/keybox => io/bastillion}/manage/util/SessionOutputUtil.java (94%) mode change 100755 => 100644 rename src/main/resources/{KeyBoxConfig.properties => BastillionConfig.properties} (90%) mode change 100755 => 100644 rename src/main/webapp/_res/css/{keybox.css => bastillion.css} (100%) mode change 100755 => 100644 create mode 100644 src/main/webapp/img/bastillion.ico create mode 100644 src/main/webapp/img/bastillion_100x100.png create mode 100644 src/main/webapp/img/bastillion_200x200.png create mode 100644 src/main/webapp/img/bastillion_40x40.png delete mode 100755 src/main/webapp/img/keybox.ico delete mode 100755 src/main/webapp/img/keybox_100x100.png delete mode 100755 src/main/webapp/img/keybox_200x200.png delete mode 100755 src/main/webapp/img/keybox_40x40.png diff --git a/README.md b/README.md index 8ed04293..e2dc7c5a 100755 --- a/README.md +++ b/README.md @@ -1,39 +1,24 @@ -KeyBox +Bastillion ====== -KeyBox is a web-based SSH console that centrally manages administrative access to systems. Web-based administration is combined with management and distribution of user's public SSH keys. Key management and administration is based on profiles assigned to defined users. +Bastillion is a web-based SSH console that centrally manages administrative access to systems. Web-based administration is combined with management and distribution of user's public SSH keys. Key management and administration is based on profiles assigned to defined users. Administrators can login using two-factor authentication with [FreeOTP](https://freeotp.github.io/) or [Google Authenticator](https://github.com/google/google-authenticator). From there they can manage their public SSH keys or connect to their systems through a web-shell. Commands can be shared across shells to make patching easier and eliminate redundant command execution. -KeyBox layers TLS/SSL on top of SSH and acts as a bastion host for administration. Protocols are stacked (TLS/SSL + SSH) so infrastructure cannot be exposed through tunneling / port forwarding. More details can be found in the following whitepaper: [Implementing a Trusted Third-Party System for Secure Shell](https://www.sshkeybox.com/docs/using/whitepaper). Also, SSH key management is enabled by default to prevent unmanaged public keys and enforce best practices. +Bastillion layers TLS/SSL on top of SSH and acts as a bastion host for administration. Protocols are stacked (TLS/SSL + SSH) so infrastructure cannot be exposed through tunneling / port forwarding. More details can be found in the following whitepaper: [Implementing a Trusted Third-Party System for Secure Shell](https://www.bastillion.io/docs/using/whitepaper). Also, SSH key management is enabled by default to prevent unmanaged public keys and enforce best practices. -![Terminals](https://www.sshkeybox.com/images/screenshots/medium/terminals.png) +![Terminals](https://www.bastillion.io/images/screenshots/medium/terminals.png) -AMI in the AWS Marketplace +Bastillion Releases ------ -If you are using AWS, the simplest way to get started is to run the AMI from the AWS Marketplace. - -http://aws.amazon.com/marketplace/pp/B076PNFPCL - -Once the KeyBox instance is up and running, open your browser to https://\:443 - -Login with - - username:admin - password: - -In order to help register new EC2 instances, the KeyBox public can be found under 'Settings -> Public Key' and should be imported as an EC2 Key Pair in the AWS console. - -KeyBox Releases ------- -This software is free for non-commercial use under the AGPL licence! - Commercial users can purchase a license through an annual subscription and access the binary releases. -https://www.sshkeybox.com/subscription +https://www.bastillion.io/subscription Also, users can purchase through the AWS Marketplace. -Feel free to try out KeyBox using the build instructions below! +Feel free to try out Bastillion for a limited amount of users(6) or systems(12)! + +https://github.com/bastillion-io/Bastillion/releases Prerequisites ------------- @@ -49,7 +34,7 @@ Prerequisites **Loophole MVC** *(Only needed if building from source)* -> https://github.com/skavanagh/lmvc +> https://github.com/bastillion-io/lmvc **Install [FreeOTP](https://freeotp.github.io/) or [Google Authenticator](https://github.com/google/google-authenticator)** to enable two-factor authentication with Android or iOS @@ -72,7 +57,7 @@ In the directory that contains the pom.xml run *Note: Doing a mvn clean will delete the H2 DB and wipe out all the data.* -Using KeyBox +Using Bastillion ------ Open browser to https://\:8443 @@ -97,24 +82,24 @@ Steps: Managing SSH Keys ------ -By default KeyBox will overwrite all values in the specified authorized_keys file for a system. You can disable key management by editing KeyBoxConfig.properties file and use KeyBox only as a bastion host. This file is located in the jetty/keybox/WEB-INF/classes directory. (or the src/main/resources directory if building from source) +By default Bastillion will overwrite all values in the specified authorized_keys file for a system. You can disable key management by editing BastillionConfig.properties file and use Bastillion only as a bastion host. This file is located in the jetty/bastillion/WEB-INF/classes directory. (or the src/main/resources directory if building from source) - #set to false to disable key management. If false, the KeyBox public key will be appended to the authorized_keys file (instead of it being overwritten completely). + #set to false to disable key management. If false, the Bastillion public key will be appended to the authorized_keys file (instead of it being overwritten completely). keyManagementEnabled=false -Also, the authorized_keys file is updated/refreshed periodically based on the relationships defined in the application. If key management is enabled the refresh interval can be specified in the KeyBoxConfig.properties file. +Also, the authorized_keys file is updated/refreshed periodically based on the relationships defined in the application. If key management is enabled the refresh interval can be specified in the BastillionConfig.properties file. #authorized_keys refresh interval in minutes (no refresh for <=0) authKeysRefreshInterval=120 -By default KeyBox will generated and distribute the SSH keys managed by administrators while having them download the generated private. This forces admins to use strong passphrases for keys that are set on systems. The private key is only available for download once and is not stored on the application side. To disable and allow administrators to set any public key edit the KeyBoxConfig.properties. +By default Bastillion will generated and distribute the SSH keys managed by administrators while having them download the generated private. This forces admins to use strong passphrases for keys that are set on systems. The private key is only available for download once and is not stored on the application side. To disable and allow administrators to set any public key edit the BastillionConfig.properties. #set to true to generate keys when added/managed by users and enforce strong passphrases set to false to allow users to set their own public key forceUserKeyGeneration=false Supplying a Custom SSH Key Pair ------ -KeyBox generates its own public/private SSH key upon initial startup for use when registering systems. You can specify a custom SSH key pair in the KeyBoxConfig.properties file. +Bastillion generates its own public/private SSH key upon initial startup for use when registering systems. You can specify a custom SSH key pair in the BastillionConfig.properties file. For example: @@ -140,22 +125,22 @@ Adjusting Database Settings Database settings can be adjusted in the configuration properties. #Database user - dbUser=keybox + dbUser=bastillion #Database password dbPassword=p@$$w0rd!! #Database JDBC driver dbDriver=org.h2.Driver #Connection URL to the DB - dbConnectionURL=jdbc:h2:keydb/keybox;CIPHER=AES; + dbConnectionURL=jdbc:h2:keydb/bastillion;CIPHER=AES; By default the datastore is set as embedded, but a remote H2 database can supported through adjusting the connection URL. #Connection URL to the DB - dbConnectionURL=jdbc:h2:tcp://:/~/keybox;CIPHER=AES; + dbConnectionURL=jdbc:h2:tcp://:/~/bastillion;CIPHER=AES; External Authentication ------ -External Authentication can be enabled through the KeyBoxConfig.properties. +External Authentication can be enabled through the BastillionConfig.properties. For example: @@ -166,7 +151,7 @@ Connection details need to be set in the jaas.conf file ldap-ol { com.sun.security.auth.module.LdapLoginModule SUFFICIENT - userProvider="ldap://hostname:389/ou=example,dc=keybox,dc=com" + userProvider="ldap://hostname:389/ou=example,dc=bastillion,dc=com" userFilter="(&(uid={USERNAME})(objectClass=inetOrgPerson))" authzIdentity="{cn}" useSSL=false @@ -176,7 +161,7 @@ Connection details need to be set in the jaas.conf file Administrators will be added as they are authenticated and profiles of systems may be assigned by full-privileged users. -User LDAP roles can be mapped to profiles defined in KeyBox through the use of the org.eclipse.jetty.jaas.spi.LdapLoginModule. +User LDAP roles can be mapped to profiles defined in Bastillion through the use of the org.eclipse.jetty.jaas.spi.LdapLoginModule. ldap-ol-with-roles { //openldap auth with roles that can map to profiles @@ -190,12 +175,12 @@ User LDAP roles can be mapped to profiles defined in KeyBox through the use of t bindPassword="" authenticationMethod="simple" forceBindingLogin="true" - userBaseDn="ou=users,dc=keybox,dc=com" + userBaseDn="ou=users,dc=bastillion,dc=com" userRdnAttribute="uid" userIdAttribute="uid" userPasswordAttribute="userPassword" userObjectClass="inetOrgPerson" - roleBaseDn="ou=groups,dc=keybox,dc=com" + roleBaseDn="ou=groups,dc=bastillion,dc=com" roleNameAttribute="cn" roleMemberAttribute="member" roleObjectClass="groupOfNames"; @@ -205,26 +190,26 @@ Users will be added/removed from defined profiles as they login and when the rol Auditing ------ -Auditing is disabled by default and is only a proof of concept. Can be enabled in the KeyBoxConfig.properties. +Auditing is disabled by default and is only a proof of concept. Can be enabled in the BastillionConfig.properties. #enable audit --set to true to enable enableInternalAudit=true Screenshots ----------- -![Login](https://www.sshkeybox.com/images/screenshots/medium/login.png) +![Login](https://www.bastillion.io/images/screenshots/medium/login.png) -![Two-Factor](https://www.sshkeybox.com/images/screenshots/medium/two-factor.png) +![Two-Factor](https://www.bastillion.io/images/screenshots/medium/two-factor.png) -![More Terminals](https://www.sshkeybox.com/images/screenshots/medium/terminals.png) +![More Terminals](https://www.bastillion.io/images/screenshots/medium/terminals.png) -![Manage Systems](https://www.sshkeybox.com/images/screenshots/medium/manage_systems.png) +![Manage Systems](https://www.bastillion.io/images/screenshots/medium/manage_systems.png) -![Manage Users](https://www.sshkeybox.com/images/screenshots/medium/manage_users.png) +![Manage Users](https://www.bastillion.io/images/screenshots/medium/manage_users.png) -![Define SSH Keys](https://www.sshkeybox.com/images/screenshots/medium/manage_keys.png) +![Define SSH Keys](https://www.bastillion.io/images/screenshots/medium/manage_keys.png) -![Disable SSH Keys](https://www.sshkeybox.com/images/screenshots/medium/disable_keys.png) +![Disable SSH Keys](https://www.bastillion.io/images/screenshots/medium/disable_keys.png) Acknowledgments ------ @@ -237,11 +222,11 @@ Third-party dependencies are mentioned in the [_3rdPartyLicenses.md_](3rdPartyLi Dual License ----------- -KeyBox is available for non-commercial use under the Affero General Public License +Bastillion is available for non-commercial use under the Affero General Public License A commercial license is also available through a subscription -https://www.sshkeybox.com/subscription +https://www.bastillion.io/subscription or when running an AMI from the AWS marketplace. diff --git a/pom.xml b/pom.xml index 40998bfa..2b509b24 100755 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - com.keybox - keybox - 3.03.00-SNAPSHOT + io.bastillion + bastillion + 3.05.00 war - KeyBox + Bastillion UTF-8 1.9 diff --git a/src/main/java/com/keybox/common/db/DBInitServlet.java b/src/main/java/io/bastillion/common/db/DBInitServlet.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/keybox/common/db/DBInitServlet.java rename to src/main/java/io/bastillion/common/db/DBInitServlet.java index 9692fd79..20a88513 --- a/src/main/java/com/keybox/common/db/DBInitServlet.java +++ b/src/main/java/io/bastillion/common/db/DBInitServlet.java @@ -25,14 +25,14 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.common.db; +package io.bastillion.common.db; -import com.keybox.common.util.AppConfig; -import com.keybox.manage.model.Auth; -import com.keybox.manage.util.DBUtils; -import com.keybox.manage.util.EncryptionUtil; -import com.keybox.manage.util.RefreshAuthKeyUtil; -import com.keybox.manage.util.SSHUtil; +import io.bastillion.common.util.AppConfig; +import io.bastillion.manage.model.Auth; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.util.EncryptionUtil; +import io.bastillion.manage.util.RefreshAuthKeyUtil; +import io.bastillion.manage.util.SSHUtil; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -136,11 +136,12 @@ public void init(ServletConfig config) throws ServletException { statement.executeUpdate("create table if not exists session_log (id BIGINT PRIMARY KEY AUTO_INCREMENT, session_tm timestamp default CURRENT_TIMESTAMP, first_nm varchar, last_nm varchar, username varchar not null, ip_address varchar)"); statement.executeUpdate("create table if not exists terminal_log (session_id BIGINT, instance_id INTEGER, output varchar not null, log_tm timestamp default CURRENT_TIMESTAMP, display_nm varchar not null, user varchar not null, host varchar not null, port INTEGER not null, foreign key (session_id) references session_log(id) on delete cascade)"); + statement.executeUpdate("create table if not exists license (id INTEGER PRIMARY KEY AUTO_INCREMENT, license_tx varchar not null)"); //if exists readfile to set default password String salt = EncryptionUtil.generateSalt(); String defaultPassword = EncryptionUtil.hash("changeme" + salt); - File file = new File("/opt/keybox/instance_id"); + File file = new File("/opt/bastillion/instance_id"); if (file.exists()) { String str = FileUtils.readFileToString(file, "UTF-8"); if(StringUtils.isNotEmpty(str)) { @@ -168,7 +169,7 @@ public void init(ServletConfig config) throws ServletException { DBUtils.closeStmt(pStmt); //generate new key and insert passphrase - System.out.println("Setting KeyBox SSH public/private key pair"); + System.out.println("Setting Bastillion SSH public/private key pair"); //generate application pub/pvt key and get values String passphrase = SSHUtil.keyGen(); @@ -183,7 +184,7 @@ public void init(ServletConfig config) throws ServletException { pStmt.execute(); DBUtils.closeStmt(pStmt); - System.out.println("KeyBox Generated Global Public Key:"); + System.out.println("Bastillion Generated Global Public Key:"); System.out.println(publicKey); //set config to default diff --git a/src/main/java/com/keybox/common/filter/AuthFilter.java b/src/main/java/io/bastillion/common/filter/AuthFilter.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/com/keybox/common/filter/AuthFilter.java rename to src/main/java/io/bastillion/common/filter/AuthFilter.java index 16843a66..8f021090 --- a/src/main/java/com/keybox/common/filter/AuthFilter.java +++ b/src/main/java/io/bastillion/common/filter/AuthFilter.java @@ -25,11 +25,11 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.common.filter; +package io.bastillion.common.filter; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.AuthDB; -import com.keybox.manage.model.Auth; +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.AuthDB; +import io.bastillion.manage.model.Auth; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -37,6 +37,7 @@ import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/common/util/AppConfig.java b/src/main/java/io/bastillion/common/util/AppConfig.java old mode 100755 new mode 100644 similarity index 93% rename from src/main/java/com/keybox/common/util/AppConfig.java rename to src/main/java/io/bastillion/common/util/AppConfig.java index 120d801b..60d1dfbf --- a/src/main/java/com/keybox/common/util/AppConfig.java +++ b/src/main/java/io/bastillion/common/util/AppConfig.java @@ -25,9 +25,9 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.common.util; +package io.bastillion.common.util; -import com.keybox.manage.util.EncryptionUtil; +import io.bastillion.manage.util.EncryptionUtil; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -51,18 +51,18 @@ public class AppConfig { try { //move configuration to specified dir if (StringUtils.isNotEmpty(System.getProperty("CONFIG_DIR"))) { - File configFile = new File(CONFIG_DIR + "/KeyBoxConfig.properties"); + File configFile = new File(CONFIG_DIR + "BastillionConfig.properties"); if (!configFile.exists()) { - File oldConfig = new File(AppConfig.class.getClassLoader().getResource(".").getPath() + "/KeyBoxConfig.properties"); + File oldConfig = new File(AppConfig.class.getClassLoader().getResource(".").getPath() + "BastillionConfig.properties"); FileUtils.moveFile(oldConfig, configFile); } - configFile = new File(CONFIG_DIR + "/jaas.conf"); + configFile = new File(CONFIG_DIR + "jaas.conf"); if (!configFile.exists()) { - File oldConfig = new File(AppConfig.class.getClassLoader().getResource(".").getPath() + "/jaas.conf"); + File oldConfig = new File(AppConfig.class.getClassLoader().getResource(".").getPath() + "jaas.conf"); FileUtils.moveFile(oldConfig, configFile); } } - prop = new PropertiesConfiguration(CONFIG_DIR + "/KeyBoxConfig.properties"); + prop = new PropertiesConfiguration(CONFIG_DIR + "BastillionConfig.properties"); } catch (Exception ex) { log.error(ex.toString(), ex); } diff --git a/src/main/java/com/keybox/common/util/AuthUtil.java b/src/main/java/io/bastillion/common/util/AuthUtil.java similarity index 99% rename from src/main/java/com/keybox/common/util/AuthUtil.java rename to src/main/java/io/bastillion/common/util/AuthUtil.java index 0be03955..995c5426 100644 --- a/src/main/java/com/keybox/common/util/AuthUtil.java +++ b/src/main/java/io/bastillion/common/util/AuthUtil.java @@ -25,9 +25,9 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.common.util; +package io.bastillion.common.util; -import com.keybox.manage.util.EncryptionUtil; +import io.bastillion.manage.util.EncryptionUtil; import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/keybox/manage/control/AuthKeysKtrl.java b/src/main/java/io/bastillion/manage/control/AuthKeysKtrl.java similarity index 96% rename from src/main/java/com/keybox/manage/control/AuthKeysKtrl.java rename to src/main/java/io/bastillion/manage/control/AuthKeysKtrl.java index d42ca995..c53e1def 100644 --- a/src/main/java/com/keybox/manage/control/AuthKeysKtrl.java +++ b/src/main/java/io/bastillion/manage/control/AuthKeysKtrl.java @@ -25,24 +25,25 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; import com.jcraft.jsch.JSch; import com.jcraft.jsch.KeyPair; -import com.keybox.common.util.AppConfig; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.*; -import com.keybox.manage.model.*; -import com.keybox.manage.util.EncryptionUtil; -import com.keybox.manage.util.PasswordUtil; -import com.keybox.manage.util.RefreshAuthKeyUtil; -import com.keybox.manage.util.SSHUtil; +import io.bastillion.common.util.AppConfig; +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.*; +import io.bastillion.manage.model.*; +import io.bastillion.manage.util.EncryptionUtil; +import io.bastillion.manage.util.PasswordUtil; +import io.bastillion.manage.util.RefreshAuthKeyUtil; +import io.bastillion.manage.util.SSHUtil; +import io.bastillion.manage.db.*; +import io.bastillion.manage.model.*; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; import loophole.mvc.annotation.Validate; import loophole.mvc.base.BaseKontroller; -import loophole.mvc.filter.SecurityFilter; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/control/LoginKtrl.java b/src/main/java/io/bastillion/manage/control/LoginKtrl.java similarity index 92% rename from src/main/java/com/keybox/manage/control/LoginKtrl.java rename to src/main/java/io/bastillion/manage/control/LoginKtrl.java index 9445c9d1..3502ce4c 100644 --- a/src/main/java/com/keybox/manage/control/LoginKtrl.java +++ b/src/main/java/io/bastillion/manage/control/LoginKtrl.java @@ -25,14 +25,14 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; - -import com.keybox.common.util.AppConfig; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.AuthDB; -import com.keybox.manage.model.Auth; -import com.keybox.manage.model.User; -import com.keybox.manage.util.OTPUtil; +package io.bastillion.manage.control; + +import io.bastillion.common.util.AppConfig; +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.AuthDB; +import io.bastillion.manage.model.Auth; +import io.bastillion.manage.model.User; +import io.bastillion.manage.util.OTPUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; @@ -50,7 +50,7 @@ public class LoginKtrl extends BaseKontroller { //check if otp is enabled @Model(name = "otpEnabled") static final Boolean otpEnabled = ("required".equals(AppConfig.getProperty("oneTimePassword")) || "optional".equals(AppConfig.getProperty("oneTimePassword"))); - private static Logger loginAuditLogger = LoggerFactory.getLogger("com.keybox.manage.control.LoginAudit"); + private static Logger loginAuditLogger = LoggerFactory.getLogger("io.bastillion.manage.control.LoginAudit"); private final String AUTH_ERROR = "Authentication Failed : Login credentials are invalid"; private final String AUTH_ERROR_NO_PROFILE = "Authentication Failed : There are no profiles assigned to this account"; @Model(name = "auth") diff --git a/src/main/java/com/keybox/manage/control/OTPKtrl.java b/src/main/java/io/bastillion/manage/control/OTPKtrl.java similarity index 89% rename from src/main/java/com/keybox/manage/control/OTPKtrl.java rename to src/main/java/io/bastillion/manage/control/OTPKtrl.java index d08b8f46..1c72faea 100644 --- a/src/main/java/com/keybox/manage/control/OTPKtrl.java +++ b/src/main/java/io/bastillion/manage/control/OTPKtrl.java @@ -25,17 +25,17 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; -import com.keybox.common.util.AppConfig; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.AuthDB; -import com.keybox.manage.db.UserDB; -import com.keybox.manage.util.OTPUtil; +import io.bastillion.common.util.AppConfig; +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.AuthDB; +import io.bastillion.manage.db.UserDB; +import io.bastillion.manage.util.OTPUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; @@ -106,7 +106,7 @@ public String qrImage() { try { - String qrCodeText = "otpauth://totp/KeyBox%20%28" + URLEncoder.encode(getRequest().getHeader("host").replaceAll("\\:.*$", ""), "utf-8") + "%29:" + username + "?secret=" + secret; + String qrCodeText = "otpauth://totp/Bastillion%20%28" + URLEncoder.encode(getRequest().getHeader("host").replaceAll("\\:.*$", ""), "utf-8") + "%29:" + username + "?secret=" + secret; QRCodeWriter qrWriter = new QRCodeWriter(); diff --git a/src/main/java/com/keybox/manage/control/ProfileKtrl.java b/src/main/java/io/bastillion/manage/control/ProfileKtrl.java similarity index 93% rename from src/main/java/com/keybox/manage/control/ProfileKtrl.java rename to src/main/java/io/bastillion/manage/control/ProfileKtrl.java index 947fb6c4..d3609070 100644 --- a/src/main/java/com/keybox/manage/control/ProfileKtrl.java +++ b/src/main/java/io/bastillion/manage/control/ProfileKtrl.java @@ -25,11 +25,11 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; -import com.keybox.manage.db.ProfileDB; -import com.keybox.manage.model.Profile; -import com.keybox.manage.model.SortedSet; +import io.bastillion.manage.db.ProfileDB; +import io.bastillion.manage.model.Profile; +import io.bastillion.manage.model.SortedSet; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; diff --git a/src/main/java/com/keybox/manage/control/ProfileSystemsKtrl.java b/src/main/java/io/bastillion/manage/control/ProfileSystemsKtrl.java similarity index 90% rename from src/main/java/com/keybox/manage/control/ProfileSystemsKtrl.java rename to src/main/java/io/bastillion/manage/control/ProfileSystemsKtrl.java index 7ed73ef8..196104b3 100644 --- a/src/main/java/com/keybox/manage/control/ProfileSystemsKtrl.java +++ b/src/main/java/io/bastillion/manage/control/ProfileSystemsKtrl.java @@ -25,14 +25,14 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; -import com.keybox.manage.db.ProfileDB; -import com.keybox.manage.db.ProfileSystemsDB; -import com.keybox.manage.db.SystemDB; -import com.keybox.manage.model.Profile; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.util.RefreshAuthKeyUtil; +import io.bastillion.manage.db.ProfileDB; +import io.bastillion.manage.db.ProfileSystemsDB; +import io.bastillion.manage.db.SystemDB; +import io.bastillion.manage.model.Profile; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.util.RefreshAuthKeyUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; diff --git a/src/main/java/com/keybox/manage/control/ProfileUsersKtrl.java b/src/main/java/io/bastillion/manage/control/ProfileUsersKtrl.java similarity index 90% rename from src/main/java/com/keybox/manage/control/ProfileUsersKtrl.java rename to src/main/java/io/bastillion/manage/control/ProfileUsersKtrl.java index ea2b9792..e434777e 100644 --- a/src/main/java/com/keybox/manage/control/ProfileUsersKtrl.java +++ b/src/main/java/io/bastillion/manage/control/ProfileUsersKtrl.java @@ -25,14 +25,14 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; -import com.keybox.manage.db.ProfileDB; -import com.keybox.manage.db.UserDB; -import com.keybox.manage.db.UserProfileDB; -import com.keybox.manage.model.Profile; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.util.RefreshAuthKeyUtil; +import io.bastillion.manage.db.ProfileDB; +import io.bastillion.manage.db.UserDB; +import io.bastillion.manage.db.UserProfileDB; +import io.bastillion.manage.model.Profile; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.util.RefreshAuthKeyUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; diff --git a/src/main/java/com/keybox/manage/control/ScriptKtrl.java b/src/main/java/io/bastillion/manage/control/ScriptKtrl.java similarity index 95% rename from src/main/java/com/keybox/manage/control/ScriptKtrl.java rename to src/main/java/io/bastillion/manage/control/ScriptKtrl.java index 65753d42..5d905ad7 100644 --- a/src/main/java/com/keybox/manage/control/ScriptKtrl.java +++ b/src/main/java/io/bastillion/manage/control/ScriptKtrl.java @@ -25,12 +25,12 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.ScriptDB; -import com.keybox.manage.model.Script; -import com.keybox.manage.model.SortedSet; +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.ScriptDB; +import io.bastillion.manage.model.Script; +import io.bastillion.manage.model.SortedSet; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; diff --git a/src/main/java/com/keybox/manage/control/SecureShellKtrl.java b/src/main/java/io/bastillion/manage/control/SecureShellKtrl.java similarity index 97% rename from src/main/java/com/keybox/manage/control/SecureShellKtrl.java rename to src/main/java/io/bastillion/manage/control/SecureShellKtrl.java index 5d387ce7..b9a79b58 100644 --- a/src/main/java/com/keybox/manage/control/SecureShellKtrl.java +++ b/src/main/java/io/bastillion/manage/control/SecureShellKtrl.java @@ -25,18 +25,19 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; import com.jcraft.jsch.ChannelShell; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.*; -import com.keybox.manage.model.*; -import com.keybox.manage.util.SSHUtil; +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.*; +import io.bastillion.manage.model.*; +import io.bastillion.manage.db.*; +import io.bastillion.manage.model.*; +import io.bastillion.manage.util.SSHUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; import loophole.mvc.base.BaseKontroller; -import loophole.mvc.filter.SecurityFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/control/SessionAuditKtrl.java b/src/main/java/io/bastillion/manage/control/SessionAuditKtrl.java similarity index 91% rename from src/main/java/com/keybox/manage/control/SessionAuditKtrl.java rename to src/main/java/io/bastillion/manage/control/SessionAuditKtrl.java index f28f6190..ee305f7d 100644 --- a/src/main/java/com/keybox/manage/control/SessionAuditKtrl.java +++ b/src/main/java/io/bastillion/manage/control/SessionAuditKtrl.java @@ -25,16 +25,16 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; +package io.bastillion.manage.control; import com.google.gson.Gson; -import com.keybox.manage.db.SessionAuditDB; -import com.keybox.manage.db.SystemDB; -import com.keybox.manage.db.UserDB; -import com.keybox.manage.model.HostSystem; -import com.keybox.manage.model.SessionAudit; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.model.User; +import io.bastillion.manage.db.SessionAuditDB; +import io.bastillion.manage.db.SystemDB; +import io.bastillion.manage.db.UserDB; +import io.bastillion.manage.model.HostSystem; +import io.bastillion.manage.model.SessionAudit; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.model.User; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; diff --git a/src/main/java/com/keybox/manage/control/SystemKtrl.java b/src/main/java/io/bastillion/manage/control/SystemKtrl.java similarity index 59% rename from src/main/java/com/keybox/manage/control/SystemKtrl.java rename to src/main/java/io/bastillion/manage/control/SystemKtrl.java index 2eaaf702..01368dc5 100644 --- a/src/main/java/com/keybox/manage/control/SystemKtrl.java +++ b/src/main/java/io/bastillion/manage/control/SystemKtrl.java @@ -1,39 +1,41 @@ /** - * Copyright (C) 2013 Loophole, LLC - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * As a special exception, the copyright holders give permission to link the - * code of portions of this program with the OpenSSL library under certain - * conditions as described in each individual source file and distribute - * linked combinations including the program with the OpenSSL library. You - * must comply with the GNU Affero General Public License in all respects for - * all of the code used other than as permitted herein. If you modify file(s) - * with this exception, you may extend this exception to your version of the - * file(s), but you are not obligated to do so. If you do not wish to do so, - * delete this exception statement from your version. If you delete this - * exception statement from all source files in the program, then also delete - * it in the license file. + * Copyright (C) 2013 Loophole, LLC + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + *

+ * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + *

+ * As a special exception, the copyright holders give permission to link the + * code of portions of this program with the OpenSSL library under certain + * conditions as described in each individual source file and distribute + * linked combinations including the program with the OpenSSL library. You + * must comply with the GNU Affero General Public License in all respects for + * all of the code used other than as permitted herein. If you modify file(s) + * with this exception, you may extend this exception to your version of the + * file(s), but you are not obligated to do so. If you do not wish to do so, + * delete this exception statement from your version. If you delete this + * exception statement from all source files in the program, then also delete + * it in the license file. */ -package com.keybox.manage.control; - -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.ProfileDB; -import com.keybox.manage.db.ScriptDB; -import com.keybox.manage.db.SystemDB; -import com.keybox.manage.db.UserProfileDB; -import com.keybox.manage.model.*; -import com.keybox.manage.util.SSHUtil; +package io.bastillion.manage.control; + +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.ProfileDB; +import io.bastillion.manage.db.ScriptDB; +import io.bastillion.manage.db.SystemDB; +import io.bastillion.manage.db.UserProfileDB; +import io.bastillion.manage.model.*; +import io.bastillion.manage.model.*; +import io.bastillion.manage.util.LicenseUtil; +import io.bastillion.manage.util.SSHUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; @@ -62,7 +64,7 @@ public class SystemKtrl extends BaseKontroller { @Model(name = "passphrase") String passphrase; @Model(name = "profileList") - List profileList= new ArrayList<>(); + List profileList = new ArrayList<>(); public SystemKtrl(HttpServletRequest request, HttpServletResponse response) { super(request, response); @@ -74,10 +76,10 @@ public String viewAdminSystems() { if (Auth.MANAGER.equals(AuthUtil.getUserType(getRequest().getSession()))) { sortedSet = SystemDB.getSystemSet(sortedSet); - profileList=ProfileDB.getAllProfiles(); + profileList = ProfileDB.getAllProfiles(); } else { sortedSet = SystemDB.getUserSystemSet(sortedSet, userId); - profileList= UserProfileDB.getProfilesByUser(userId); + profileList = UserProfileDB.getProfilesByUser(userId); } if (script != null && script.getId() != null) { script = ScriptDB.getScript(script.getId(), userId); @@ -89,26 +91,29 @@ public String viewAdminSystems() { @Kontrol(path = "/manage/viewSystems", method = MethodType.GET) public String viewManageSystems() { sortedSet = SystemDB.getSystemSet(sortedSet); - profileList=ProfileDB.getAllProfiles(); - return "/manage/view_systems.html"; } @Kontrol(path = "/manage/saveSystem", method = MethodType.POST) public String saveSystem() { - String retVal="redirect:/manage/viewSystems.ktrl?sortedSet.orderByDirection=" + sortedSet.getOrderByDirection() + "&sortedSet.orderByField=" + sortedSet.getOrderByField(); + String retVal = "redirect:/manage/viewSystems.ktrl?sortedSet.orderByDirection=" + sortedSet.getOrderByDirection() + "&sortedSet.orderByField=" + sortedSet.getOrderByField(); hostSystem = SSHUtil.authAndAddPubKey(hostSystem, passphrase, password); if (hostSystem.getId() != null) { SystemDB.updateSystem(hostSystem); } else { - hostSystem.setId(SystemDB.insertSystem(hostSystem)); + if (LicenseUtil.isValid() || SystemDB.getSystemSet(sortedSet).getItemList().size() < 12) { + hostSystem.setId(SystemDB.insertSystem(hostSystem)); + } else { + addError("Systems can no longer be added without a valid license"); + retVal = "/manage/view_systems.html"; + } } sortedSet = SystemDB.getSystemSet(sortedSet); if (!HostSystem.SUCCESS_STATUS.equals(hostSystem.getStatusCd())) { - retVal="/manage/view_systems.html"; + retVal = "/manage/view_systems.html"; } return retVal; } diff --git a/src/main/java/com/keybox/manage/control/UploadAndPushKtrl.java b/src/main/java/io/bastillion/manage/control/UploadAndPushKtrl.java similarity index 96% rename from src/main/java/com/keybox/manage/control/UploadAndPushKtrl.java rename to src/main/java/io/bastillion/manage/control/UploadAndPushKtrl.java index 0e476e38..bc41ed75 100644 --- a/src/main/java/com/keybox/manage/control/UploadAndPushKtrl.java +++ b/src/main/java/io/bastillion/manage/control/UploadAndPushKtrl.java @@ -25,18 +25,17 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; - -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.SystemStatusDB; -import com.keybox.manage.model.HostSystem; -import com.keybox.manage.model.SchSession; -import com.keybox.manage.util.DBUtils; -import com.keybox.manage.util.SSHUtil; +package io.bastillion.manage.control; + +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.SystemStatusDB; +import io.bastillion.manage.model.HostSystem; +import io.bastillion.manage.model.SchSession; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.util.SSHUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; -import loophole.mvc.annotation.Validate; import loophole.mvc.base.BaseKontroller; import loophole.mvc.filter.SecurityFilter; import org.apache.commons.fileupload.FileItem; diff --git a/src/main/java/com/keybox/manage/control/UserSettingsKtrl.java b/src/main/java/io/bastillion/manage/control/UserSettingsKtrl.java similarity index 78% rename from src/main/java/com/keybox/manage/control/UserSettingsKtrl.java rename to src/main/java/io/bastillion/manage/control/UserSettingsKtrl.java index e950816c..905b8ccc 100644 --- a/src/main/java/com/keybox/manage/control/UserSettingsKtrl.java +++ b/src/main/java/io/bastillion/manage/control/UserSettingsKtrl.java @@ -25,20 +25,23 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; - -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.AuthDB; -import com.keybox.manage.db.PrivateKeyDB; -import com.keybox.manage.db.UserThemeDB; -import com.keybox.manage.model.Auth; -import com.keybox.manage.model.UserSettings; -import com.keybox.manage.util.PasswordUtil; +package io.bastillion.manage.control; + +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.AuthDB; +import io.bastillion.manage.db.LicenseDB; +import io.bastillion.manage.db.PrivateKeyDB; +import io.bastillion.manage.db.UserThemeDB; +import io.bastillion.manage.model.Auth; +import io.bastillion.manage.model.UserSettings; +import io.bastillion.manage.util.LicenseUtil; +import io.bastillion.manage.util.PasswordUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; import loophole.mvc.annotation.Validate; import loophole.mvc.base.BaseKontroller; +import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -73,6 +76,10 @@ public class UserSettingsKtrl extends BaseKontroller { Auth auth; @Model(name = "userSettings") UserSettings userSettings; + @Model(name = "license") + String license; + @Model(name ="expirationDt") + String expirationDt; @@ -83,6 +90,11 @@ public UserSettingsKtrl(HttpServletRequest request, HttpServletResponse response @Kontrol(path = "/admin/userSettings", method = MethodType.GET) public String userSettings() { userSettings = UserThemeDB.getTheme(AuthUtil.getUserId(getRequest().getSession())); + license = LicenseDB.getLicense(); + expirationDt = LicenseUtil.getExpirationDt(license); + if(StringUtils.isNotEmpty(license) && !LicenseUtil.isValid(license)) { + addError("License is invalid or has expired"); + } return "/admin/user_settings.html"; } @@ -118,6 +130,17 @@ public String themeSubmit() { return "redirect:/admin/menu.html"; } + @Kontrol(path = "/admin/licenseSubmit", method = MethodType.POST) + public String licenseSubmit() { + String retVal = "/admin/user_settings.html"; + if(LicenseUtil.isValid(license)) { + LicenseDB.saveLicense(license); + retVal = "redirect:/admin/menu.html"; + } else { + addError("License is invalid or has expired"); + } + return retVal; + } /** * Validates fields for password submit */ diff --git a/src/main/java/com/keybox/manage/control/UsersKtrl.java b/src/main/java/io/bastillion/manage/control/UsersKtrl.java similarity index 81% rename from src/main/java/com/keybox/manage/control/UsersKtrl.java rename to src/main/java/io/bastillion/manage/control/UsersKtrl.java index ea6938e7..cbeee1ea 100644 --- a/src/main/java/com/keybox/manage/control/UsersKtrl.java +++ b/src/main/java/io/bastillion/manage/control/UsersKtrl.java @@ -25,16 +25,17 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.control; - -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.db.PublicKeyDB; -import com.keybox.manage.db.UserDB; -import com.keybox.manage.model.Auth; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.model.User; -import com.keybox.manage.util.PasswordUtil; -import com.keybox.manage.util.RefreshAuthKeyUtil; +package io.bastillion.manage.control; + +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.db.PublicKeyDB; +import io.bastillion.manage.db.UserDB; +import io.bastillion.manage.model.Auth; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.model.User; +import io.bastillion.manage.util.LicenseUtil; +import io.bastillion.manage.util.PasswordUtil; +import io.bastillion.manage.util.RefreshAuthKeyUtil; import loophole.mvc.annotation.Kontrol; import loophole.mvc.annotation.MethodType; import loophole.mvc.annotation.Model; @@ -73,6 +74,7 @@ public String viewUsers() { @Kontrol(path = "/manage/saveUser", method = MethodType.POST) public String saveUser() { + String retVal = "redirect:/manage/viewUsers.ktrl?sortedSet.orderByDirection=" + sortedSet.getOrderByDirection() + "&sortedSet.orderByField=" + sortedSet.getOrderByField(); if (user.getId() != null) { if (user.getPassword() == null || user.getPassword().trim().equals("")) { @@ -85,11 +87,19 @@ public String saveUser() { UserDB.resetSharedSecret(user.getId()); } } else { - UserDB.insertUser(user); - } - return "redirect:/manage/viewUsers.ktrl?sortedSet.orderByDirection=" + sortedSet.getOrderByDirection() + "&sortedSet.orderByField=" + sortedSet.getOrderByField(); + if(LicenseUtil.isValid() || UserDB.getUserSet(sortedSet).getItemList().size() < 6) { + UserDB.insertUser(user); + } else { + addError("Users can no longer be added without a valid license"); + userId = AuthUtil.getUserId(getRequest().getSession()); + sortedSet = UserDB.getUserSet(sortedSet); + + retVal="/manage/view_users.html"; + } + } + return retVal; } @Kontrol(path = "/manage/deleteUser", method = MethodType.GET) diff --git a/src/main/java/com/keybox/manage/db/AuthDB.java b/src/main/java/io/bastillion/manage/db/AuthDB.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/db/AuthDB.java rename to src/main/java/io/bastillion/manage/db/AuthDB.java index 5ce13a4d..a4c23fd9 --- a/src/main/java/com/keybox/manage/db/AuthDB.java +++ b/src/main/java/io/bastillion/manage/db/AuthDB.java @@ -25,13 +25,13 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.Auth; -import com.keybox.manage.model.User; -import com.keybox.manage.util.DBUtils; -import com.keybox.manage.util.EncryptionUtil; -import com.keybox.manage.util.ExternalAuthUtil; +import io.bastillion.manage.model.Auth; +import io.bastillion.manage.model.User; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.util.EncryptionUtil; +import io.bastillion.manage.util.ExternalAuthUtil; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/src/main/java/com/keybox/manage/db/PrivateKeyDB.java b/src/main/java/io/bastillion/manage/db/PrivateKeyDB.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/keybox/manage/db/PrivateKeyDB.java rename to src/main/java/io/bastillion/manage/db/PrivateKeyDB.java index 2600143e..0baca141 --- a/src/main/java/com/keybox/manage/db/PrivateKeyDB.java +++ b/src/main/java/io/bastillion/manage/db/PrivateKeyDB.java @@ -25,15 +25,16 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.ApplicationKey; -import com.keybox.manage.util.DBUtils; -import com.keybox.manage.util.EncryptionUtil; +import io.bastillion.manage.model.ApplicationKey; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.util.EncryptionUtil; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/db/ProfileDB.java b/src/main/java/io/bastillion/manage/db/ProfileDB.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/db/ProfileDB.java rename to src/main/java/io/bastillion/manage/db/ProfileDB.java index edcbb7dd..48456a6e --- a/src/main/java/com/keybox/manage/db/ProfileDB.java +++ b/src/main/java/io/bastillion/manage/db/ProfileDB.java @@ -25,11 +25,11 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.Profile; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.util.DBUtils; +import io.bastillion.manage.model.Profile; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.util.DBUtils; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/com/keybox/manage/db/ProfileSystemsDB.java b/src/main/java/io/bastillion/manage/db/ProfileSystemsDB.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/db/ProfileSystemsDB.java rename to src/main/java/io/bastillion/manage/db/ProfileSystemsDB.java index d2a906bd..27a3f80e --- a/src/main/java/com/keybox/manage/db/ProfileSystemsDB.java +++ b/src/main/java/io/bastillion/manage/db/ProfileSystemsDB.java @@ -25,16 +25,17 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.HostSystem; -import com.keybox.manage.util.DBUtils; +import io.bastillion.manage.model.HostSystem; +import io.bastillion.manage.util.DBUtils; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/db/PublicKeyDB.java b/src/main/java/io/bastillion/manage/db/PublicKeyDB.java similarity index 99% rename from src/main/java/com/keybox/manage/db/PublicKeyDB.java rename to src/main/java/io/bastillion/manage/db/PublicKeyDB.java index f710c248..f4916309 100644 --- a/src/main/java/com/keybox/manage/db/PublicKeyDB.java +++ b/src/main/java/io/bastillion/manage/db/PublicKeyDB.java @@ -25,12 +25,12 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.PublicKey; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.util.DBUtils; -import com.keybox.manage.util.SSHUtil; +import io.bastillion.manage.model.PublicKey; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.util.SSHUtil; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/src/main/java/com/keybox/manage/db/ScriptDB.java b/src/main/java/io/bastillion/manage/db/ScriptDB.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/keybox/manage/db/ScriptDB.java rename to src/main/java/io/bastillion/manage/db/ScriptDB.java index 3f3e4791..ece1ddea --- a/src/main/java/com/keybox/manage/db/ScriptDB.java +++ b/src/main/java/io/bastillion/manage/db/ScriptDB.java @@ -25,17 +25,18 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.Script; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.util.DBUtils; +import io.bastillion.manage.model.Script; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.util.DBUtils; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/db/SessionAuditDB.java b/src/main/java/io/bastillion/manage/db/SessionAuditDB.java similarity index 98% rename from src/main/java/com/keybox/manage/db/SessionAuditDB.java rename to src/main/java/io/bastillion/manage/db/SessionAuditDB.java index 5bcd02dc..03d5ef5c 100644 --- a/src/main/java/com/keybox/manage/db/SessionAuditDB.java +++ b/src/main/java/io/bastillion/manage/db/SessionAuditDB.java @@ -25,12 +25,13 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.common.util.AppConfig; -import com.keybox.manage.model.*; -import com.keybox.manage.util.DBUtils; +import io.bastillion.common.util.AppConfig; +import io.bastillion.manage.model.*; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.model.*; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/src/main/java/com/keybox/manage/db/SystemDB.java b/src/main/java/io/bastillion/manage/db/SystemDB.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/db/SystemDB.java rename to src/main/java/io/bastillion/manage/db/SystemDB.java index ddce9071..67794559 --- a/src/main/java/com/keybox/manage/db/SystemDB.java +++ b/src/main/java/io/bastillion/manage/db/SystemDB.java @@ -25,11 +25,11 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.HostSystem; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.util.DBUtils; +import io.bastillion.manage.model.HostSystem; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.util.DBUtils; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/src/main/java/com/keybox/manage/db/SystemStatusDB.java b/src/main/java/io/bastillion/manage/db/SystemStatusDB.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/keybox/manage/db/SystemStatusDB.java rename to src/main/java/io/bastillion/manage/db/SystemStatusDB.java index 2c90a491..c74634a8 --- a/src/main/java/com/keybox/manage/db/SystemStatusDB.java +++ b/src/main/java/io/bastillion/manage/db/SystemStatusDB.java @@ -25,14 +25,12 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.model.Auth; -import com.keybox.manage.model.HostSystem; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.util.DBUtils; -import org.apache.commons.lang3.StringUtils; +import io.bastillion.manage.model.Auth; +import io.bastillion.manage.model.HostSystem; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.util.DBUtils; import java.sql.Connection; @@ -40,6 +38,7 @@ import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/db/UserDB.java b/src/main/java/io/bastillion/manage/db/UserDB.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/db/UserDB.java rename to src/main/java/io/bastillion/manage/db/UserDB.java index e848a14e..6be8fd4b --- a/src/main/java/com/keybox/manage/db/UserDB.java +++ b/src/main/java/io/bastillion/manage/db/UserDB.java @@ -25,12 +25,12 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.SortedSet; -import com.keybox.manage.model.User; -import com.keybox.manage.util.DBUtils; -import com.keybox.manage.util.EncryptionUtil; +import io.bastillion.manage.model.SortedSet; +import io.bastillion.manage.model.User; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.util.EncryptionUtil; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; @@ -268,7 +268,7 @@ public static Long insertUser(Connection con, User user) { stmt.setString(5, user.getAuthType()); stmt.setString(6, user.getUserType()); if(StringUtils.isNotEmpty(user.getPassword())) { - String salt=EncryptionUtil.generateSalt(); + String salt= EncryptionUtil.generateSalt(); stmt.setString(7, EncryptionUtil.hash(user.getPassword() + salt)); stmt.setString(8, salt); }else { diff --git a/src/main/java/com/keybox/manage/db/UserProfileDB.java b/src/main/java/io/bastillion/manage/db/UserProfileDB.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/db/UserProfileDB.java rename to src/main/java/io/bastillion/manage/db/UserProfileDB.java index 8c7f0295..4657fca1 --- a/src/main/java/com/keybox/manage/db/UserProfileDB.java +++ b/src/main/java/io/bastillion/manage/db/UserProfileDB.java @@ -25,10 +25,10 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.Profile; -import com.keybox.manage.util.DBUtils; +import io.bastillion.manage.model.Profile; +import io.bastillion.manage.util.DBUtils; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/com/keybox/manage/db/UserThemeDB.java b/src/main/java/io/bastillion/manage/db/UserThemeDB.java similarity index 97% rename from src/main/java/com/keybox/manage/db/UserThemeDB.java rename to src/main/java/io/bastillion/manage/db/UserThemeDB.java index 4eba4b5e..9600cbca 100644 --- a/src/main/java/com/keybox/manage/db/UserThemeDB.java +++ b/src/main/java/io/bastillion/manage/db/UserThemeDB.java @@ -25,10 +25,10 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.db; +package io.bastillion.manage.db; -import com.keybox.manage.model.UserSettings; -import com.keybox.manage.util.DBUtils; +import io.bastillion.manage.model.UserSettings; +import io.bastillion.manage.util.DBUtils; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/src/main/java/com/keybox/manage/model/ApplicationKey.java b/src/main/java/io/bastillion/manage/model/ApplicationKey.java similarity index 98% rename from src/main/java/com/keybox/manage/model/ApplicationKey.java rename to src/main/java/io/bastillion/manage/model/ApplicationKey.java index 7e5f8eb2..7b98b7ab 100644 --- a/src/main/java/com/keybox/manage/model/ApplicationKey.java +++ b/src/main/java/io/bastillion/manage/model/ApplicationKey.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; /** * Value object for applications ssh keys diff --git a/src/main/java/com/keybox/manage/model/AuditWrapper.java b/src/main/java/io/bastillion/manage/model/AuditWrapper.java similarity index 98% rename from src/main/java/com/keybox/manage/model/AuditWrapper.java rename to src/main/java/io/bastillion/manage/model/AuditWrapper.java index a529fcef..cdd071a5 100644 --- a/src/main/java/com/keybox/manage/model/AuditWrapper.java +++ b/src/main/java/io/bastillion/manage/model/AuditWrapper.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; public class AuditWrapper { diff --git a/src/main/java/com/keybox/manage/model/Auth.java b/src/main/java/io/bastillion/manage/model/Auth.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/com/keybox/manage/model/Auth.java rename to src/main/java/io/bastillion/manage/model/Auth.java index bbbae4c1..bda274dc --- a/src/main/java/com/keybox/manage/model/Auth.java +++ b/src/main/java/io/bastillion/manage/model/Auth.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; /** * Value object that contains login information diff --git a/src/main/java/com/keybox/manage/model/HostSystem.java b/src/main/java/io/bastillion/manage/model/HostSystem.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/com/keybox/manage/model/HostSystem.java rename to src/main/java/io/bastillion/manage/model/HostSystem.java index e7c810a9..3244d571 --- a/src/main/java/com/keybox/manage/model/HostSystem.java +++ b/src/main/java/io/bastillion/manage/model/HostSystem.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.List; diff --git a/src/main/java/com/keybox/manage/model/Profile.java b/src/main/java/io/bastillion/manage/model/Profile.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/model/Profile.java rename to src/main/java/io/bastillion/manage/model/Profile.java index e03041db..fcb9486b --- a/src/main/java/com/keybox/manage/model/Profile.java +++ b/src/main/java/io/bastillion/manage/model/Profile.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.List; diff --git a/src/main/java/com/keybox/manage/model/PublicKey.java b/src/main/java/io/bastillion/manage/model/PublicKey.java similarity index 99% rename from src/main/java/com/keybox/manage/model/PublicKey.java rename to src/main/java/io/bastillion/manage/model/PublicKey.java index 8be1c8fe..b32cb795 100644 --- a/src/main/java/com/keybox/manage/model/PublicKey.java +++ b/src/main/java/io/bastillion/manage/model/PublicKey.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.Date; diff --git a/src/main/java/com/keybox/manage/model/SchSession.java b/src/main/java/io/bastillion/manage/model/SchSession.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/model/SchSession.java rename to src/main/java/io/bastillion/manage/model/SchSession.java index d17d5ce1..f0374834 --- a/src/main/java/com/keybox/manage/model/SchSession.java +++ b/src/main/java/io/bastillion/manage/model/SchSession.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import com.jcraft.jsch.Channel; import com.jcraft.jsch.Session; diff --git a/src/main/java/com/keybox/manage/model/Script.java b/src/main/java/io/bastillion/manage/model/Script.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/model/Script.java rename to src/main/java/io/bastillion/manage/model/Script.java index fb0a2eaf..a4b0baa0 --- a/src/main/java/com/keybox/manage/model/Script.java +++ b/src/main/java/io/bastillion/manage/model/Script.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; /** * Value object that contains script information diff --git a/src/main/java/com/keybox/manage/model/SessionAudit.java b/src/main/java/io/bastillion/manage/model/SessionAudit.java similarity index 98% rename from src/main/java/com/keybox/manage/model/SessionAudit.java rename to src/main/java/io/bastillion/manage/model/SessionAudit.java index 8fe4672f..7cb7f441 100644 --- a/src/main/java/com/keybox/manage/model/SessionAudit.java +++ b/src/main/java/io/bastillion/manage/model/SessionAudit.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.Date; diff --git a/src/main/java/com/keybox/manage/model/SessionOutput.java b/src/main/java/io/bastillion/manage/model/SessionOutput.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/model/SessionOutput.java rename to src/main/java/io/bastillion/manage/model/SessionOutput.java index 3f4b99ad..06dcf4be --- a/src/main/java/com/keybox/manage/model/SessionOutput.java +++ b/src/main/java/io/bastillion/manage/model/SessionOutput.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; /** diff --git a/src/main/java/com/keybox/manage/model/SortedSet.java b/src/main/java/io/bastillion/manage/model/SortedSet.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/model/SortedSet.java rename to src/main/java/io/bastillion/manage/model/SortedSet.java index 7b3b71e9..c1fd26c0 --- a/src/main/java/com/keybox/manage/model/SortedSet.java +++ b/src/main/java/io/bastillion/manage/model/SortedSet.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/keybox/manage/model/User.java b/src/main/java/io/bastillion/manage/model/User.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/model/User.java rename to src/main/java/io/bastillion/manage/model/User.java index 8bccf413..b066b4bc --- a/src/main/java/com/keybox/manage/model/User.java +++ b/src/main/java/io/bastillion/manage/model/User.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.List; diff --git a/src/main/java/com/keybox/manage/model/UserSchSessions.java b/src/main/java/io/bastillion/manage/model/UserSchSessions.java similarity index 98% rename from src/main/java/com/keybox/manage/model/UserSchSessions.java rename to src/main/java/io/bastillion/manage/model/UserSchSessions.java index 3fb9739a..7f0ec9e6 100644 --- a/src/main/java/com/keybox/manage/model/UserSchSessions.java +++ b/src/main/java/io/bastillion/manage/model/UserSchSessions.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.Map; diff --git a/src/main/java/com/keybox/manage/model/UserSessionsOutput.java b/src/main/java/io/bastillion/manage/model/UserSessionsOutput.java similarity index 98% rename from src/main/java/com/keybox/manage/model/UserSessionsOutput.java rename to src/main/java/io/bastillion/manage/model/UserSessionsOutput.java index ec7e5524..12b06742 100644 --- a/src/main/java/com/keybox/manage/model/UserSessionsOutput.java +++ b/src/main/java/io/bastillion/manage/model/UserSessionsOutput.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/keybox/manage/model/UserSettings.java b/src/main/java/io/bastillion/manage/model/UserSettings.java similarity index 98% rename from src/main/java/com/keybox/manage/model/UserSettings.java rename to src/main/java/io/bastillion/manage/model/UserSettings.java index cbc3c773..d614cc85 100644 --- a/src/main/java/com/keybox/manage/model/UserSettings.java +++ b/src/main/java/io/bastillion/manage/model/UserSettings.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.model; +package io.bastillion.manage.model; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/keybox/manage/socket/GetHttpSessionConfigurator.java b/src/main/java/io/bastillion/manage/socket/GetHttpSessionConfigurator.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/socket/GetHttpSessionConfigurator.java rename to src/main/java/io/bastillion/manage/socket/GetHttpSessionConfigurator.java index 2aef956c..59084f7b --- a/src/main/java/com/keybox/manage/socket/GetHttpSessionConfigurator.java +++ b/src/main/java/io/bastillion/manage/socket/GetHttpSessionConfigurator.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.socket; +package io.bastillion.manage.socket; import javax.servlet.http.HttpSession; import javax.websocket.HandshakeResponse; diff --git a/src/main/java/com/keybox/manage/socket/SecureShellWS.java b/src/main/java/io/bastillion/manage/socket/SecureShellWS.java similarity index 94% rename from src/main/java/com/keybox/manage/socket/SecureShellWS.java rename to src/main/java/io/bastillion/manage/socket/SecureShellWS.java index 90ff7845..c64287cb 100644 --- a/src/main/java/com/keybox/manage/socket/SecureShellWS.java +++ b/src/main/java/io/bastillion/manage/socket/SecureShellWS.java @@ -1,14 +1,14 @@ -package com.keybox.manage.socket; +package io.bastillion.manage.socket; import com.google.gson.Gson; -import com.keybox.common.util.AppConfig; -import com.keybox.common.util.AuthUtil; -import com.keybox.manage.control.SecureShellKtrl; -import com.keybox.manage.db.UserDB; -import com.keybox.manage.model.SchSession; -import com.keybox.manage.model.UserSchSessions; -import com.keybox.manage.task.SentOutputTask; -import com.keybox.manage.util.SessionOutputUtil; +import io.bastillion.common.util.AppConfig; +import io.bastillion.common.util.AuthUtil; +import io.bastillion.manage.control.SecureShellKtrl; +import io.bastillion.manage.db.UserDB; +import io.bastillion.manage.model.SchSession; +import io.bastillion.manage.model.UserSchSessions; +import io.bastillion.manage.task.SentOutputTask; +import io.bastillion.manage.util.SessionOutputUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/task/SecureShellTask.java b/src/main/java/io/bastillion/manage/task/SecureShellTask.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/keybox/manage/task/SecureShellTask.java rename to src/main/java/io/bastillion/manage/task/SecureShellTask.java index c13875e4..46dbc4ca --- a/src/main/java/com/keybox/manage/task/SecureShellTask.java +++ b/src/main/java/io/bastillion/manage/task/SecureShellTask.java @@ -25,14 +25,15 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.task; +package io.bastillion.manage.task; -import com.keybox.manage.util.SessionOutputUtil; -import com.keybox.manage.model.SessionOutput; +import io.bastillion.manage.util.SessionOutputUtil; +import io.bastillion.manage.model.SessionOutput; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/task/SentOutputTask.java b/src/main/java/io/bastillion/manage/task/SentOutputTask.java old mode 100755 new mode 100644 similarity index 92% rename from src/main/java/com/keybox/manage/task/SentOutputTask.java rename to src/main/java/io/bastillion/manage/task/SentOutputTask.java index 0d0ff2b2..bed57194 --- a/src/main/java/com/keybox/manage/task/SentOutputTask.java +++ b/src/main/java/io/bastillion/manage/task/SentOutputTask.java @@ -25,17 +25,18 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.task; +package io.bastillion.manage.task; import com.google.gson.Gson; -import com.keybox.manage.model.SessionOutput; -import com.keybox.manage.model.User; -import com.keybox.manage.util.DBUtils; -import com.keybox.manage.util.SessionOutputUtil; +import io.bastillion.manage.model.SessionOutput; +import io.bastillion.manage.model.User; +import io.bastillion.manage.util.DBUtils; +import io.bastillion.manage.util.SessionOutputUtil; import javax.websocket.Session; import java.sql.Connection; import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/util/DBUtils.java b/src/main/java/io/bastillion/manage/util/DBUtils.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/util/DBUtils.java rename to src/main/java/io/bastillion/manage/util/DBUtils.java index 0ade7066..c24fdd66 --- a/src/main/java/com/keybox/manage/util/DBUtils.java +++ b/src/main/java/io/bastillion/manage/util/DBUtils.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; import java.sql.Connection; import java.sql.ResultSet; diff --git a/src/main/java/com/keybox/manage/util/DSPool.java b/src/main/java/io/bastillion/manage/util/DSPool.java similarity index 97% rename from src/main/java/com/keybox/manage/util/DSPool.java rename to src/main/java/io/bastillion/manage/util/DSPool.java index 402f2c9f..81be01d4 100644 --- a/src/main/java/com/keybox/manage/util/DSPool.java +++ b/src/main/java/io/bastillion/manage/util/DSPool.java @@ -25,11 +25,11 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.keybox.common.util.AppConfig; +import io.bastillion.common.util.AppConfig; import org.apache.commons.dbcp2.BasicDataSource; /** diff --git a/src/main/java/com/keybox/manage/util/EncryptionUtil.java b/src/main/java/io/bastillion/manage/util/EncryptionUtil.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/com/keybox/manage/util/EncryptionUtil.java rename to src/main/java/io/bastillion/manage/util/EncryptionUtil.java index 1cd6a9b0..ae51cc3f --- a/src/main/java/com/keybox/manage/util/EncryptionUtil.java +++ b/src/main/java/io/bastillion/manage/util/EncryptionUtil.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; @@ -100,10 +100,11 @@ public static String hash(String str) { /** * return encrypted value of string * + * @param key secret key * @param str unencrypted string * @return encrypted string */ - public static String encrypt(String str) { + public static String encrypt(byte[] key, String str) { String retVal = null; if (str != null && str.length() > 0) { @@ -123,10 +124,11 @@ public static String encrypt(String str) { /** * return decrypted value of encrypted string * + * @param key secret key * @param str encrypted string * @return decrypted string */ - public static String decrypt(String str) { + public static String decrypt(byte[] key, String str) { String retVal = null; if (str != null && str.length() > 0) { try { @@ -142,5 +144,25 @@ public static String decrypt(String str) { return retVal; } + /** + * return encrypted value of string + * + * @param str unencrypted string + * @return encrypted string + */ + public static String encrypt(String str) { + return encrypt(key, str); + } + + /** + * return decrypted value of encrypted string + * + * @param str encrypted string + * @return decrypted string + */ + public static String decrypt(String str) { + return decrypt(key, str); + } + } diff --git a/src/main/java/com/keybox/manage/util/ExternalAuthUtil.java b/src/main/java/io/bastillion/manage/util/ExternalAuthUtil.java similarity index 98% rename from src/main/java/com/keybox/manage/util/ExternalAuthUtil.java rename to src/main/java/io/bastillion/manage/util/ExternalAuthUtil.java index e96a77a0..48adc8a0 100644 --- a/src/main/java/com/keybox/manage/util/ExternalAuthUtil.java +++ b/src/main/java/io/bastillion/manage/util/ExternalAuthUtil.java @@ -25,14 +25,14 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; - -import com.keybox.common.util.AppConfig; -import com.keybox.manage.db.AuthDB; -import com.keybox.manage.db.UserDB; -import com.keybox.manage.db.UserProfileDB; -import com.keybox.manage.model.Auth; -import com.keybox.manage.model.User; +package io.bastillion.manage.util; + +import io.bastillion.common.util.AppConfig; +import io.bastillion.manage.db.AuthDB; +import io.bastillion.manage.db.UserDB; +import io.bastillion.manage.db.UserProfileDB; +import io.bastillion.manage.model.Auth; +import io.bastillion.manage.model.User; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/keybox/manage/util/KeyStoreUtil.java b/src/main/java/io/bastillion/manage/util/KeyStoreUtil.java similarity index 97% rename from src/main/java/com/keybox/manage/util/KeyStoreUtil.java rename to src/main/java/io/bastillion/manage/util/KeyStoreUtil.java index dcacbb7a..10938718 100644 --- a/src/main/java/com/keybox/manage/util/KeyStoreUtil.java +++ b/src/main/java/io/bastillion/manage/util/KeyStoreUtil.java @@ -25,11 +25,10 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; -import com.keybox.common.util.AppConfig; +import io.bastillion.common.util.AppConfig; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +48,7 @@ public class KeyStoreUtil { private static KeyStore keyStore = null; private static final String keyStoreFile = AppConfig.CONFIG_DIR - + "/keybox.jceks"; + + "/bastillion.jceks"; private static final char[] KEYSTORE_PASS = new char[]{ 'G', '~', 'r', 'x', 'Z', 'E', 'w', 'f', 'a', '[', '!', 'f', 'Z', 'd', '*', 'L', '8', 'm', 'h', 'u', '#', 'j', '9', ':', '~', ';', 'U', '>', 'O', 'i', '8', 'r', 'C', '}', 'f', 't', '%', '[', 'H', 'h', 'M', '&', diff --git a/src/main/java/com/keybox/manage/util/OTPUtil.java b/src/main/java/io/bastillion/manage/util/OTPUtil.java similarity index 99% rename from src/main/java/com/keybox/manage/util/OTPUtil.java rename to src/main/java/io/bastillion/manage/util/OTPUtil.java index d73dd5cc..567c5373 100644 --- a/src/main/java/com/keybox/manage/util/OTPUtil.java +++ b/src/main/java/io/bastillion/manage/util/OTPUtil.java @@ -25,7 +25,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; import org.apache.commons.codec.binary.Base32; diff --git a/src/main/java/com/keybox/manage/util/PasswordUtil.java b/src/main/java/io/bastillion/manage/util/PasswordUtil.java similarity index 96% rename from src/main/java/com/keybox/manage/util/PasswordUtil.java rename to src/main/java/io/bastillion/manage/util/PasswordUtil.java index a469e82a..824e519e 100644 --- a/src/main/java/com/keybox/manage/util/PasswordUtil.java +++ b/src/main/java/io/bastillion/manage/util/PasswordUtil.java @@ -25,9 +25,9 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; -import com.keybox.common.util.AppConfig; +import io.bastillion.common.util.AppConfig; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/keybox/manage/util/RefreshAuthKeyUtil.java b/src/main/java/io/bastillion/manage/util/RefreshAuthKeyUtil.java similarity index 98% rename from src/main/java/com/keybox/manage/util/RefreshAuthKeyUtil.java rename to src/main/java/io/bastillion/manage/util/RefreshAuthKeyUtil.java index 3c151d3b..bed2fa92 100644 --- a/src/main/java/com/keybox/manage/util/RefreshAuthKeyUtil.java +++ b/src/main/java/io/bastillion/manage/util/RefreshAuthKeyUtil.java @@ -25,9 +25,9 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; -import com.keybox.common.util.AppConfig; +import io.bastillion.common.util.AppConfig; import java.util.Timer; import java.util.TimerTask; diff --git a/src/main/java/com/keybox/manage/util/SSHUtil.java b/src/main/java/io/bastillion/manage/util/SSHUtil.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/com/keybox/manage/util/SSHUtil.java rename to src/main/java/io/bastillion/manage/util/SSHUtil.java index eefa13fe..692f6dfb --- a/src/main/java/com/keybox/manage/util/SSHUtil.java +++ b/src/main/java/io/bastillion/manage/util/SSHUtil.java @@ -25,13 +25,15 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; import com.jcraft.jsch.*; -import com.keybox.common.util.AppConfig; -import com.keybox.manage.db.*; -import com.keybox.manage.model.*; -import com.keybox.manage.task.SecureShellTask; +import io.bastillion.common.util.AppConfig; +import io.bastillion.manage.db.*; +import io.bastillion.manage.model.*; +import io.bastillion.manage.db.*; +import io.bastillion.manage.task.SecureShellTask; +import io.bastillion.manage.model.*; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; @@ -197,7 +199,7 @@ public static String keyGen(String passphrase) { } else if ("ecdsa".equals(SSHUtil.KEY_TYPE)) { type = KeyPair.ECDSA; } - String comment = "keybox@global_key"; + String comment = "bastillion@global_key"; JSch jsch = new JSch(); diff --git a/src/main/java/com/keybox/manage/util/SessionOutputSerializer.java b/src/main/java/io/bastillion/manage/util/SessionOutputSerializer.java similarity index 97% rename from src/main/java/com/keybox/manage/util/SessionOutputSerializer.java rename to src/main/java/io/bastillion/manage/util/SessionOutputSerializer.java index 633967b0..5e68e894 100644 --- a/src/main/java/com/keybox/manage/util/SessionOutputSerializer.java +++ b/src/main/java/io/bastillion/manage/util/SessionOutputSerializer.java @@ -25,13 +25,14 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.keybox.manage.model.AuditWrapper; +import io.bastillion.manage.model.AuditWrapper; + import java.lang.reflect.Type; import java.util.Date; diff --git a/src/main/java/com/keybox/manage/util/SessionOutputUtil.java b/src/main/java/io/bastillion/manage/util/SessionOutputUtil.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/keybox/manage/util/SessionOutputUtil.java rename to src/main/java/io/bastillion/manage/util/SessionOutputUtil.java index 17e6e494..56eaeea3 --- a/src/main/java/com/keybox/manage/util/SessionOutputUtil.java +++ b/src/main/java/io/bastillion/manage/util/SessionOutputUtil.java @@ -25,16 +25,16 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -package com.keybox.manage.util; +package io.bastillion.manage.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.keybox.common.util.AppConfig; -import com.keybox.manage.db.SessionAuditDB; -import com.keybox.manage.model.AuditWrapper; -import com.keybox.manage.model.SessionOutput; -import com.keybox.manage.model.User; -import com.keybox.manage.model.UserSessionsOutput; +import io.bastillion.common.util.AppConfig; +import io.bastillion.manage.db.SessionAuditDB; +import io.bastillion.manage.model.AuditWrapper; +import io.bastillion.manage.model.SessionOutput; +import io.bastillion.manage.model.User; +import io.bastillion.manage.model.UserSessionsOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.commons.lang3.StringUtils; @@ -53,7 +53,7 @@ public class SessionOutputUtil { private static Map userSessionsOutputMap = new ConcurrentHashMap<>(); public final static boolean enableInternalAudit = "true".equals(AppConfig.getProperty("enableInternalAudit")); private static Gson gson = new GsonBuilder().registerTypeAdapter(AuditWrapper.class, new SessionOutputSerializer()).create(); - private static Logger systemAuditLogger = LoggerFactory.getLogger("com.keybox.manage.util.SystemAudit"); + private static Logger systemAuditLogger = LoggerFactory.getLogger("io.bastillion.manage.util.SystemAudit"); private SessionOutputUtil() { } diff --git a/src/main/resources/KeyBoxConfig.properties b/src/main/resources/BastillionConfig.properties old mode 100755 new mode 100644 similarity index 90% rename from src/main/resources/KeyBoxConfig.properties rename to src/main/resources/BastillionConfig.properties index e833d5f3..ec11f901 --- a/src/main/resources/KeyBoxConfig.properties +++ b/src/main/resources/BastillionConfig.properties @@ -1,5 +1,5 @@ # -# KeyBox Configuration Options +# Bastillion Configuration Options # # #set to true to regenerate and import SSH keys @@ -26,7 +26,7 @@ websocketTimeout=0 agentForwarding=false #enable two-factor authentication with a one-time password - 'required', 'optional', or 'disabled' oneTimePassword=optional -#set to false to disable key management. If false, the KeyBox public key will be appended to the authorized_keys file (instead of it being overwritten completely). +#set to false to disable key management. If false, the Bastillion public key will be appended to the authorized_keys file (instead of it being overwritten completely). keyManagementEnabled=true #set to true to generate keys when added/managed by users and enforce strong passphrases set to false to allow users to set their own public key forceUserKeyGeneration=true @@ -47,13 +47,13 @@ use256EncryptionKey=false #Database and connection pool settings #Database user -dbUser=keybox +dbUser=bastillion #Database password dbPassword= #Database JDBC driver dbDriver=org.h2.Driver #Connection URL to the DB -dbConnectionURL=jdbc:h2:keydb/keybox;CIPHER=AES; +dbConnectionURL=jdbc:h2:keydb/bastillion;CIPHER=AES; #Max connections in the connection pool maxActive=25 #When true, objects will be validated before being returned by the connection pool diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt index 2dca1c00..2c51149d 100644 --- a/src/main/resources/VERSION.txt +++ b/src/main/resources/VERSION.txt @@ -1 +1 @@ -KeyBox - Version: ${version} \ No newline at end of file +Bastillion - Version: ${version} \ No newline at end of file diff --git a/src/main/resources/jaas.conf b/src/main/resources/jaas.conf index 7fd3cbf4..23c79320 100644 --- a/src/main/resources/jaas.conf +++ b/src/main/resources/jaas.conf @@ -3,8 +3,8 @@ ldap-ol { //openldap auth first example config com.sun.security.auth.module.LdapLoginModule REQUIRED - userProvider="ldap://:389/ou=users,dc=keybox,dc=com" - authIdentity="uid={USERNAME},ou=users,dc=keybox,dc=com" + userProvider="ldap://:389/ou=users,dc=bastillion,dc=com" + authIdentity="uid={USERNAME},ou=users,dc=bastillion,dc=com" userFilter="(&(uid={USERNAME})(objectClass=inetOrgPerson))" authzIdentity="{cn}" //set this to return full name useSSL=false @@ -37,12 +37,12 @@ ldap-ol-with-roles { bindPassword="" authenticationMethod="simple" forceBindingLogin="false" - userBaseDn="ou=users,dc=keybox,dc=com" + userBaseDn="ou=users,dc=bastillion,dc=com" userRdnAttribute="uid" userIdAttribute="uid" userPasswordAttribute="userPassword" userObjectClass="inetOrgPerson" - roleBaseDn="ou=groups,dc=keybox,dc=com" + roleBaseDn="ou=groups,dc=bastillion,dc=com" roleNameAttribute="cn" roleMemberAttribute="member" roleObjectClass="groupOfNames"; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index f6bef71e..2c21dca2 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -9,7 +9,7 @@ @@ -22,11 +22,11 @@ - + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8a52e5f5..525ccaa9 100755 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -11,7 +11,7 @@ AuthFilter - com.keybox.common.filter.AuthFilter + io.bastillion.common.filter.AuthFilter diff --git a/src/main/webapp/_res/css/keybox.css b/src/main/webapp/_res/css/bastillion.css old mode 100755 new mode 100644 similarity index 100% rename from src/main/webapp/_res/css/keybox.css rename to src/main/webapp/_res/css/bastillion.css diff --git a/src/main/webapp/_res/inc/header.html b/src/main/webapp/_res/inc/header.html index fed34d55..e22fe0e9 100644 --- a/src/main/webapp/_res/inc/header.html +++ b/src/main/webapp/_res/inc/header.html @@ -34,8 +34,8 @@ - - + + - KeyBox - Main Menu + Bastillion - Main Menu @@ -107,7 +107,7 @@ Create scripts to be executed on selected systems simultaneously through a web-terminal. - + Manage SSH Keys @@ -122,7 +122,7 @@ Set additional public SSH keys for current user. - + Audit Sessions diff --git a/src/main/webapp/admin/secure_shell.html b/src/main/webapp/admin/secure_shell.html index bbc1e949..0387f4e0 100644 --- a/src/main/webapp/admin/secure_shell.html +++ b/src/main/webapp/admin/secure_shell.html @@ -538,7 +538,7 @@ - KeyBox - Composite Terms + Bastillion - Composite Terms @@ -549,10 +549,10 @@

-
keybox +
bastillion
- KeyBox + Bastillion
diff --git a/src/main/webapp/admin/upload.html b/src/main/webapp/admin/upload.html index ff5d599e..2ede1840 100644 --- a/src/main/webapp/admin/upload.html +++ b/src/main/webapp/admin/upload.html @@ -48,7 +48,7 @@ } - KeyBox - Upload & Push + Bastillion - Upload & Push diff --git a/src/main/webapp/admin/upload_result.html b/src/main/webapp/admin/upload_result.html index bf045468..e9a5be73 100644 --- a/src/main/webapp/admin/upload_result.html +++ b/src/main/webapp/admin/upload_result.html @@ -32,7 +32,7 @@ - KeyBox - Upload & Push + Bastillion - Upload & Push - KeyBox - Manage Keys + Bastillion - Manage Keys @@ -170,11 +170,11 @@

Manage SSH Keys

- Key Name - Profile - Type - Fingerprint - Created + Key Name + Profile + Type + Fingerprint + Created   diff --git a/src/main/webapp/admin/view_scripts.html b/src/main/webapp/admin/view_scripts.html index c56db8c5..af9cc7e8 100644 --- a/src/main/webapp/admin/view_scripts.html +++ b/src/main/webapp/admin/view_scripts.html @@ -82,7 +82,7 @@ /*]]>*/ - KeyBox - Manage Scripts + Bastillion - Manage Scripts @@ -107,7 +107,7 @@

Manage Scripts

- Script Name + Script Name   diff --git a/src/main/webapp/admin/view_systems.html b/src/main/webapp/admin/view_systems.html index 10571855..f0efc2c6 100644 --- a/src/main/webapp/admin/view_systems.html +++ b/src/main/webapp/admin/view_systems.html @@ -70,7 +70,7 @@ }); /*]]>*/ - KeyBox - Manage Systems + Bastillion - Manage Systems @@ -119,12 +119,12 @@

Composite SSH Terminals

- - - + + + diff --git a/src/main/webapp/error.html b/src/main/webapp/error.html index 6464a22d..8f8769cc 100644 --- a/src/main/webapp/error.html +++ b/src/main/webapp/error.html @@ -29,7 +29,7 @@ - KeyBox - Error + Bastillion - Error @@ -39,9 +39,9 @@
- keybox + bastillion
- KeyBox + Bastillion
diff --git a/src/main/webapp/img/bastillion.ico b/src/main/webapp/img/bastillion.ico new file mode 100644 index 0000000000000000000000000000000000000000..c2a0d8b3b64094c79dcaa9cc9e6196ca10ebf5d7 GIT binary patch literal 7790 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 MV@q_yMYq`h0)P2o6#xJL literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/bastillion_200x200.png b/src/main/webapp/img/bastillion_200x200.png new file mode 100644 index 0000000000000000000000000000000000000000..628e3cc0db3ee7f4f2110ae63e74579f316b9261 GIT binary patch literal 6301 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 ZoWxTG*%Zq0#eZ)JR1`Fj6>?@F{{{Rjty=&9 literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/bastillion_40x40.png b/src/main/webapp/img/bastillion_40x40.png new file mode 100644 index 0000000000000000000000000000000000000000..d4135b099181035525f5bff94fc987c41771d34a GIT binary patch literal 1664 zcmV-`27md9P)WFU8GbZ8()Nlj2>E@cM*00rbpL_t(o!|j=0NK|xhDS5%v%G&`wTap`r{#lozB&~Bl04UgytT{^BXazSEMWKkWwY8O#larjBoMdZjD@BBgq7cBGHTLUu zExDz$asYn-prR;rxm#PDmJAfH0W9cnh zwlEL~a5)PE0`z!1&Wz4jzA9Fw&+HNaI0_(Q>rB%$`u%>6kB>87d-?Ju{eC|+O>^oq z0^sOkaq|J)1z-fgtgSPj&&OyqO2aU6g7o+IFA8ZG2BXm^o12@R*_^dv?8>*43V_c5 z{A%k=(=@u>Zua%{`FDTiI$sf>ZIMWX?d|PURn@7_rvMJya904N?Eno84ICL6p=p}SIzM>u zpwsE907=p`O^%F=u%V&B=`Ri7iU1f?6on-vB@Bf^3nssL^M-QvW=#Da4N4jfn! z;Oy)y$HvBZ>eMMdfBrn@m`j%~v9z?*uF9YQ7!VP5b#-M7jK|}=cI_H#Yip_NI>X`c z0%s>qoX8t+aBz^vj~}Oqu%x7f0|Nt#j_vB|vi%NdwhmLNlo*B~s;bKU`}gJa>C+Mp zhebrh?RJZzC<~qdm6estKCa%se=ldxo|T@S9+{q=7DZ8{prAm~>2%KVhG9r5m74#q zWe*@J!^6W84u=JRkX$tQVnLiXJ3A{69z2lg>FN2$My`up^f8z#Xfl~xw?&72!TCbw ze7EE~*;$IEY;JBYC+{`SRsuFQ%}tP<%e0D2g&KiGqRxak*S; z3ux=-=FOW@UtcfBjvbS+v9Va^uDgdGh3mc)i}d0kwSKCMG82$dMy!vbWf=V~2!7p}e!G zt)#r`weeb)n`FZ_Xa7q;RaHM;KmbxyRP?FDp8!7?AW1Pz^W(lrwr}4qE|+UX@62@v zOr=uu?^mDCC$U&enwy)Yu&{8+MeACdX_}eKH~>!-MWL?i?Ck7Z(9*bl`!*XJ8|U{N z_WmQ+vD#goZR6wP?Ck8MuIu)u>6rld7Qo;3#=E+@n%&*qOr=uu6BCI9L!l72Zr!>h z-9{{a(TkR_V*PZQ-s;VkJe*8GY(c8CgdG6dfr<4B-_~_9i zR#jDHw?VF3OiFfdW;cMpoQ=trmKMh2ai-Jhj8g2`vxh}RMNX%A1DdAEcs$OQmKJAc z!mwiR&bi{Tn>N zPUd1+s?)U@z!?B@cJR8oItGKmjJC+@*RR>r)5A@hHZ2Kg7zQs~xWKx)x@?`D0kApm zbz&Bz3ZN3e9cSCOrly8NLqiz=Q&Uqsbm&k{xS^pT*3{Hww}bCkNl;h4FwTN)0uTpa z*coVRYhxmj$k}KzO_Pa4f^BVW&WzbQYg)6_dKRPx;3oi4r#^$hAg89LGO`&A2C3`1 zQ)f|YuDWJ$OMq?z@G}6@&W_jXWp8gUdwYB7^?IFIGp(`PHuO&&OP|{S^xN4iE-q$q zaj`RN{nnU`U!rGa^srUJv~@)1JER}tZ?HvxKL_xeb(F1@-+uv(Yoj{}G=UHR0000< KMNUMnLSTaAb}SG8 literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/keybox.ico b/src/main/webapp/img/keybox.ico deleted file mode 100755 index bc15bdb4e98c33b63ba5a40c82d432f8a4c565f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3006 zcmeH}SyK~15Xb*P0xHNEu816hfS?4BfXHDWkZ|9}CgD&J1w<|J;)Vh_1Vlj8(())! z3sfwz@D|WF-~9r96L5BR7loQl`Q#Im>Y1JC-*or(?DhswkY89BNWT;F4uB^BGNn>T zMt)tcT}yREYnmI{^zKAdXiHb2or(wAGd$3d;fW4|CpwK@M7+_J>4WYpHF|S=(U<3s z-uyuH7X)IUChD$>*To#Ivig1i_;TSVTVB8Xk@k$LQs-iGa9gWGF z7)+gv#dNKfNF1i?;&7)f9(U^#aF59Sh9n}%c+ixBhi7$o)SQaP=k<7UAssUp4MdEX zX)$89B@?rkc*(-k%e-Xc8826I@ce2n=34VH*H(aeA}`tt@v^f7uewUH&|Qkzt|~0_ zl;L$xIo|Y{u-IqDV!s)0uUoJ*SdFEjYP=h&!TTF0@L{ADA4lu(Y3vj}->k=%@zX@k z;OnghEKf9Id9o2JlTBEeYQpO6W~@#(w+U*k0exz<SD5(wh#r=BU$t>k{EuBl*9II!j8&eZu!JWdAVrvm>dShK@s7HSXqoH z4pc~F)DCMLaz!rQDrK7?VzReDw>umcu_M;4Nmz`nRZemmXO-HBO=}g~h)rV^vz21g z*swWgH+Ln`NU<@UDpUzH5t)7lF(FLMNh@kM24-x|#tprA!Hms5dn?9t3XOo3mrBnY z`%GPPC})W94@(nv_%ag`K$S^*h|=ybz0P8BHq>nqj{%P96tri6cFDXdkxwyc@s#rr zCYySJixv;*5WN@vf6UgVOyo^u3NL|z8s}WMLS(K8r>=si%BO@*7#OKXLfS%=_Pf-@ z6iZ-oj(V!(iuHNI1*c+i@DtV2pk)>vQm~>Vf{sQfmN^$4S^XQ#c4lGF(YouW7oUL~ u4eKn(PP0(Q9o6B9$;p}kR_1v7CQ|T)?}9>UXD9RK(C-2>n(f7Z&cJWks~cVb diff --git a/src/main/webapp/img/keybox_100x100.png b/src/main/webapp/img/keybox_100x100.png deleted file mode 100755 index a14d9b5e0898675ca6a827440af9de7edad1755e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2560 zcmV+b3jg(qP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{010SGL_t(|+U=d$R})(nhrg;I zVUm!MfTF+!+spL|D3c0CP-y$bhhF`5SN{#YR=@CiU->_}-}=e5dRP)VGKfOF4QR`1 zky&I2L%@pzLpc4AfCvdBl?swderxekq)twqFZ=9$cI`SPafFPGtuk;EcmR|G6@V3x zNGe=;fI(mgcnI`*U2Qv|J}iX*Apt)DKLg(-$5d5~1;+KSURRqq7KpL2)du_xXh@D- zOw|qi!Ru=Cgal%2Y%KxWfkLISW%U|38BiZ7m{q^JN{Qs!P(->)-1^^W0@iA01_yK5=Z zKA+JU=`>}xnkfIF6sy^&TJLs*VEFX}FNWW+BSa!iUkR!F!+lU2yI8gjiw6nZ8X$XDxR7m)tqOU?q`FE z;A6&sOS|iguwdM(zKY|TZ1%MHlkFNl(-C zskGdw!)7sR9m)eaumV38MqaMvoAy+eB${v6U^8nPO1T_Jha5RgeQOwdF}fsix1k!t z*(|LBsgUvKrb0UKZ#7MYl1?X6Ut6wKAXb?W`K-*0bQ`qb97A1@~ckn$f&GP=ul9y{y99an=aCY|NS@K47o@dF6v$G!&1(fr7R&4@_CX9UIet~D% ztLR+MvX>|B7mB~zV#?7b5ThYmQ6ux7WhURwMb(kXw{y%#;har5+1dk=Z&#MHnwptc zr8CjAW7kOd`xTI21qtEk&BR+(IulJhY5G*{E({~l#-_UArqcHGNg#gB%z9Mqkka-x zw7L$7S4onT1OjkA-==DZl(x6M?b99*C5tnCs=9Nx()KiBAYTJn|L{psBc&>(E~05i zY2QyZkm+~I)&UpK+g0gIH0?~z%xMqE#-_4jG`r1AVL@J09VslxQ@ps_-u7wJhm20l zC~oLh^;N|sIySSBTh&(;fA{F*TePCDfNXAUvHE^paoBm!Q4?`7o6Tb6o}(tJu+_7) zs!bq3RK?A*B+=rirKYkhtk2g}meJyMw@h;PdUo#RWKST+>Y2 zBqWd>A?O=;6&Dv^vlzMCP^E1kyUsmc%4_UaGxu&+Ya0ka_p`ycDX-BAlp}#`Zf)_n z_m{YN_)-f{j!nNWt*qhfimps22}MO9{*|zo_RjveiM-+&O4v83Jj-7G(b0={?bjrf z(*Oiu?bmhw?tBte5;6(pXz9|6>VJ;(q?tJnvkQx4pUomOBmGogU{+=ZHmi~Gsafp; z0r>c7gR!Z1EG~OV)2DJaD>LfOZ2No+{C9-0i5b;ydc_+Q$=KMcO8AtfPo<=&fOB>$ zR&)5Zw%gl2Mkn9mSz7%nYny8^(d?*E^=uAdLlB9yp)U`K0EH1PygETNoqiIHX=X^Rz<7Do-TEGL1S z7ARJ;k$Vl*C$^cJrhvo>ip^rAL=#0rYVWT2`3y5h|h5*kP>eM+;VCZ^Mu zW`V>CirHwO*-?WoMwX&!AhCAzv4Em^AhCmzLsR{A)z>Kr0VGyXaxEsBZ`UBpQWA(# zDBXR70IJn0`=3v#P6AOPed-ym{rDRM0!fk(2-Pe_t=w0_0MYAHX{f6pBO`6EEJ;%E zeoO%f!6BGxB_!oUv5fn7>d3X46hYW8X%~w)Jni{&U$s&B6wL!kPt((Q>pEFk=~2ND z0ly=J0LlN9ajh=8G^tN3M}Kxskf#9k;Y{9Ze9yE!CNPB!-&Z$tz|vp@!3jb@S zsQs4qTf?4JM6R=088qIi3OjYLSs(GS( zMbl2*=i9;6^9zg1t4A&Z5B~Ng)K9OQa-qp|iVr2V?b@V(x?kz%#GBB8^Kz4R^c+}Y! z_P`1uaCW)(e2}xt9k!)(bi0{bSUT=wgEBBgg3H8(VEaA5fS?5?WH23%9Jy4Awt< z45!ISpw{bZ^X#_IJ}4zXdlJftX%cAmy4psArcMI?s12Afn?ZQpUzs8Mp~N0Lp<1zzRsoaSdCZKsID3u;%Oay4phS+V+16 WhsxFqaQxf=0000O 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 - KeyBox + Bastillion diff --git a/src/main/webapp/login.html b/src/main/webapp/login.html index dc65bc63..92129761 100644 --- a/src/main/webapp/login.html +++ b/src/main/webapp/login.html @@ -29,7 +29,7 @@ - KeyBox - Login + Bastillion - Login @@ -38,9 +38,9 @@
-
keybox +
bastillion
- KeyBox + Bastillion
diff --git a/src/main/webapp/manage/view_keys.html b/src/main/webapp/manage/view_keys.html index 2b041549..ae91c105 100644 --- a/src/main/webapp/manage/view_keys.html +++ b/src/main/webapp/manage/view_keys.html @@ -45,14 +45,14 @@ window.location = 'disablePublicKey.ktrl?publicKey.id=' + id + '&sortedSet.orderByDirection=' + /*[[${sortedSet.orderByDirection}]]*/ '' + '&sortedSet.orderByField=' + /*[[${sortedSet.orderByField}]]*/ '' + '&_csrf=' + [[${session._csrf}]] - [# th:if= "${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_USER_ID) != null}"] - + '&sortedSet.filterMap[' + [[${@com.keybox.manage.db.PublicKeyDB@FILTER_BY_USER_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_USER_ID)}]]*/ '' + [# th:if= "${sortedSet.filterMap.get(@io.bastillion.manage.db.PublicKeyDB@FILTER_BY_USER_ID) != null}"] + + '&sortedSet.filterMap[' + [[${@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_USER_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_USER_ID)}]]*/ '' [/] - [# th:if= "${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID) != null}"] - + '&sortedSet.filterMap[' + [[${@com.keybox.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID)}]]*/ '' + [# th:if= "${sortedSet.filterMap.get(@io.bastillion.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID) != null}"] + + '&sortedSet.filterMap[' + [[${@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID)}]]*/ '' [/] - [# th:if= "${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_ENABLED) != null}"] - + '&sortedSet.filterMap[' + [[${@com.keybox.manage.db.PublicKeyDB@FILTER_BY_ENABLED}]] + ']=' + /*[[${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_ENABLED)}]]*/ ''; + [# th:if= "${sortedSet.filterMap.get(@io.bastillion.manage.db.PublicKeyDB@FILTER_BY_ENABLED) != null}"] + + '&sortedSet.filterMap[' + [[${@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_ENABLED}]] + ']=' + /*[[${sortedSet.filterMap.get(@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_ENABLED)}]]*/ ''; [/] }); @@ -61,14 +61,14 @@ window.location = 'enablePublicKey.ktrl?publicKey.id=' + id + '&sortedSet.orderByDirection=' + /*[[${sortedSet.orderByDirection}]]*/ '' + '&sortedSet.orderByField=' + /*[[${sortedSet.orderByField}]]*/ '' + '&_csrf=' + [[${session._csrf}]] - [# th:if= "${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_USER_ID) != null}"] - + '&sortedSet.filterMap[' + [[${@com.keybox.manage.db.PublicKeyDB@FILTER_BY_USER_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_USER_ID)}]]*/ '' + [# th:if= "${sortedSet.filterMap.get(@io.bastillion.manage.db.PublicKeyDB@FILTER_BY_USER_ID) != null}"] + + '&sortedSet.filterMap[' + [[${@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_USER_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_USER_ID)}]]*/ '' [/] - [# th:if= "${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID) != null}"] - + '&sortedSet.filterMap[' + [[${@com.keybox.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID)}]]*/ '' + [# th:if= "${sortedSet.filterMap.get(@io.bastillion.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID) != null}"] + + '&sortedSet.filterMap[' + [[${@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID}]] + ']=' + /*[[${sortedSet.filterMap.get(@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_PROFILE_ID)}]]*/ '' [/] - [# th:if= "${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_ENABLED) != null}"] - + '&sortedSet.filterMap[' + [[${@com.keybox.manage.db.PublicKeyDB@FILTER_BY_ENABLED}]] + ']=' + /*[[${sortedSet.filterMap.get(@com.keybox.manage.db.PublicKeyDB@FILTER_BY_ENABLED)}]]*/ ''; + [# th:if= "${sortedSet.filterMap.get(@io.bastillion.manage.db.PublicKeyDB@FILTER_BY_ENABLED) != null}"] + + '&sortedSet.filterMap[' + [[${@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_ENABLED}]] + ']=' + /*[[${sortedSet.filterMap.get(@io.bastillionlion.manage.db.PublicKeyDB@FILTER_BY_ENABLED)}]]*/ ''; [/] }); @@ -98,7 +98,7 @@ - KeyBox - View / Disable SSH Keys + Bastillion - View / Disable SSH Keys @@ -129,28 +129,28 @@

View / Disable SSH Keys

class="btn btn-success">Add / Remove Keys
- - - - - + + + + + diff --git a/src/main/webapp/manage/view_profile_systems.html b/src/main/webapp/manage/view_profile_systems.html index 6875fbcd..250a8642 100644 --- a/src/main/webapp/manage/view_profile_systems.html +++ b/src/main/webapp/manage/view_profile_systems.html @@ -73,7 +73,7 @@ /*]]>*/ - KeyBox - Assign Systems to Profile + Bastillion - Assign Systems to Profile @@ -107,14 +107,14 @@

- - - - + + + diff --git a/src/main/webapp/manage/view_profile_users.html b/src/main/webapp/manage/view_profile_users.html index dd5a9612..196c39c7 100644 --- a/src/main/webapp/manage/view_profile_users.html +++ b/src/main/webapp/manage/view_profile_users.html @@ -72,7 +72,7 @@ /*]]>*/ - KeyBox - Assign Users to Profile + Bastillion - Assign Users to Profile @@ -106,22 +106,22 @@

- - - + - - - @@ -135,7 +135,7 @@

- - diff --git a/src/main/webapp/manage/view_sessions.html b/src/main/webapp/manage/view_sessions.html index fb575d28..bf81728d 100644 --- a/src/main/webapp/manage/view_sessions.html +++ b/src/main/webapp/manage/view_sessions.html @@ -72,7 +72,7 @@ - KeyBox - Audit Sessions + Bastillion - Audit Sessions @@ -96,21 +96,21 @@

Audit Sessions

- @@ -145,9 +145,9 @@

Composite SSH Terminals

Display NameUserHostDisplay NameUserHost
| - - - @@ -169,11 +169,11 @@

View / Disable SSH Keys

Key NameProfileTypeFingerprintCreatedKey NameProfileTypeFingerprintCreated  
+ Display NameUserHostDisplay NameUserHost
+ UsernameAuth Type + UsernameAuth Type Last + Last Name First + First Name Email + Email Address
+ diff --git a/src/main/webapp/manage/view_profiles.html b/src/main/webapp/manage/view_profiles.html index 50b3cc1c..1d14d9ae 100644 --- a/src/main/webapp/manage/view_profiles.html +++ b/src/main/webapp/manage/view_profiles.html @@ -100,7 +100,7 @@ /*]]>*/ - KeyBox - Manage System Profiles + Bastillion - Manage System Profiles @@ -136,10 +136,10 @@

Manage System Profiles

th:value="${sortedSet.filterMap.get('profile')}" placeholder="Find associated profiles"/> 		@@ -171,7 +171,7 @@

Manage System Profiles
+ Profile Name  
- - - - - diff --git a/src/main/webapp/manage/view_systems.html b/src/main/webapp/manage/view_systems.html index 398347eb..1372f708 100644 --- a/src/main/webapp/manage/view_systems.html +++ b/src/main/webapp/manage/view_systems.html @@ -99,7 +99,7 @@ /*]]>*/ - KeyBox - Manage Systems / Distribute SSH Keys + Bastillion - Manage Systems / Distribute SSH Keys @@ -121,12 +121,12 @@

Manage Systems

- - @@ -129,20 +129,20 @@

Audit Sessions

+ Username + Last Name + First Name + IP Address + Session Time  
- - - - diff --git a/src/main/webapp/manage/view_terms.html b/src/main/webapp/manage/view_terms.html index a5a28cc8..057918ae 100644 --- a/src/main/webapp/manage/view_terms.html +++ b/src/main/webapp/manage/view_terms.html @@ -136,7 +136,7 @@ - KeyBox - Session Terms + Bastillion - Session Terms @@ -145,9 +145,9 @@
-
keybox +
bastillion
- KeyBox + Bastillion
- - - + + - - - + + + @@ -140,7 +140,7 @@

Manage Users

-
- @@ -143,14 +143,14 @@

Manage Systems

Display + Display Name User + User Host + Host Status + Status  
UsernameUser TypeAuth Type + UsernameUser TypeAuth Type Last NameFirst NameEmail AddressLast NameFirst NameEmail Address  
Administrative Only Full Access