Skip to content

Commit

Permalink
Update LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
skavanagh committed Dec 16, 2021
1 parent 2935413 commit d8a46b5
Show file tree
Hide file tree
Showing 83 changed files with 130 additions and 2,516 deletions.
662 changes: 29 additions & 633 deletions LICENSE.md

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Bastillion layers TLS/SSL on top of SSH and acts as a bastion host for administr

Bastillion Releases
------
Bastillion is available for free use under the Affero General Public License
Bastillion is available for free use under the Prosperity Public License

https://github.com/bastillion-io/Bastillion/releases

Expand All @@ -20,7 +20,7 @@ or purchase from the AWS marketplace
https://aws.amazon.com/marketplace/pp/Loophole-LLC-Bastillion/B076PNFPCL

Also, Bastillion can be installed on FreeBSD via the FreeBSD ports system. To install via the binary package, simply run:

pkg install security/bastillion

Prerequisites
Expand Down Expand Up @@ -64,15 +64,15 @@ for Linux/Unix/OSX
for Windows

startBastillion.bat

More Documentation at: https://www.bastillion.io/docs/index.html

Build from Source
------
Install Maven 3 or greater

*apt-get install maven*
> http://maven.apache.org
*apt-get install maven*
> http://maven.apache.org
Install Loophole MVC

Expand All @@ -98,7 +98,7 @@ Login with

username:admin
password:changeme

*Note: When using the AMI instance, the password is defaulted to the \<Instance ID\>. Also, the AMI uses port 443 as in https://\<Instance IP\>:443*

Managing SSH Keys
Expand Down Expand Up @@ -138,7 +138,7 @@ For example:

#default passphrase --leave blank if passphrase is empty
defaultSSHPassphrase=myPa$$w0rd

After startup and once the key has been registered it can then be removed from the system. The passphrase and the key paths will be removed from the configuration file.

Adjusting Database Settings
Expand Down Expand Up @@ -167,7 +167,7 @@ For example:

#specify a external authentication module (ex: ldap-ol, ldap-ad). Edit the jaas.conf to set connection details
jaasModule=ldap-ol

Connection details need to be set in the jaas.conf file

ldap-ol {
Expand All @@ -178,7 +178,7 @@ Connection details need to be set in the jaas.conf file
useSSL=false
debug=false;
};


Administrators will be added as they are authenticated and profiles of systems may be assigned by full-privileged users.

Expand Down Expand Up @@ -214,7 +214,7 @@ Auditing
Auditing is disabled by default. Audit logs can be enabled through the **log4j2.xml** by uncommenting the **io.bastillion.manage.util.SystemAudit** and the **audit-appender** definitions.

> https://github.com/bastillion-io/Bastillion/blob/master/src/main/resources/log4j2.xml#L19-L22
Auditing through the application is only a proof of concept. It can be enabled in the BastillionConfig.properties.

#enable audit --set to true to enable
Expand Down Expand Up @@ -245,9 +245,9 @@ Special thanks goes to these amazing projects which makes this (and other great

Third-party dependencies are mentioned in the [_3rdPartyLicenses.md_](3rdPartyLicenses.md)

AGPL License
The Prosperity Public License
-----------
Bastillion is available for use under the Affero General Public License
Bastillion is available for use under the Prosperity Public License

Author
------
Expand Down
24 changes: 1 addition & 23 deletions src/main/java/io/bastillion/common/db/DBInitServlet.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.common.db;

Expand Down
24 changes: 1 addition & 23 deletions src/main/java/io/bastillion/common/filter/AuthFilter.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.common.filter;

Expand Down
26 changes: 2 additions & 24 deletions src/main/java/io/bastillion/common/util/AppConfig.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* Copyright (C) 2013 Loophole, LLC
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* <p>
* 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.
*
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.common.util;

Expand Down
24 changes: 1 addition & 23 deletions src/main/java/io/bastillion/common/util/AuthUtil.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.common.util;

Expand Down
24 changes: 1 addition & 23 deletions src/main/java/io/bastillion/manage/control/AuthKeysKtrl.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.manage.control;

Expand Down
24 changes: 1 addition & 23 deletions src/main/java/io/bastillion/manage/control/LoginKtrl.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.manage.control;

Expand Down
24 changes: 1 addition & 23 deletions src/main/java/io/bastillion/manage/control/OTPKtrl.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.manage.control;

Expand Down
24 changes: 1 addition & 23 deletions src/main/java/io/bastillion/manage/control/ProfileKtrl.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.manage.control;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
* 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.
* Licensed under The Prosperity Public License 3.0.0
*/
package io.bastillion.manage.control;

Expand Down
Loading

0 comments on commit d8a46b5

Please sign in to comment.