Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Made admin user compliant with restrictions (API and TP) #4764

Merged
rawlinp merged 4 commits into from
Jun 8, 2020
Merged

Made admin user compliant with restrictions (API and TP) #4764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9854e8c
Added email and full name to user-add CiaB script
ocket8888 Jun 8, 2020
98ad8db
Made CiaB admin password compliant with TP min-length
ocket8888 Jun 8, 2020
85ad511
Fixed TP integration test to use env vars for creds
ocket8888 Jun 8, 2020
8e2669a
Using env vars for user defaults
ocket8888 Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions infrastructure/cdn-in-a-box/traffic_ops/adduser.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,27 @@
use Crypt::ScryptKDF qw{ scrypt_hash };

if ($#ARGV < 2) {
die "Usage: $ARGV[0] <username> <password> <role>\n";
die "Usage: $ARGV[0] USERNAME PASSWORD [ROLE] [TENANT] [EMAIL] [FULL_NAME]\n";
}

my $username = shift // 'admin';
my $username = shift // $ENV{TO_ADMIN_USER};
my $password = shift or die "Password is required\n";
my $role = shift // 'admin';
my $tenant = shift // 'root';
my $email = shift // $ENV{TO_EMAIL};
my $full_name = shift // $ENV{TO_ADMIN_FULL_NAME};

# Skip the insert if the admin 'username' is already there.
my $hashed_passwd = hash_pass( $password );
print <<"EOSQL";
INSERT INTO tm_user (username, role, local_passwd, confirm_local_passwd, tenant_id)
INSERT INTO tm_user (username, role, local_passwd, confirm_local_passwd, tenant_id, email, full_name)
VALUES ('$username',
(SELECT id FROM role WHERE name = '$role'),
'$hashed_passwd',
'$hashed_passwd',
(SELECT id FROM tenant WHERE name='$tenant'))
(SELECT id FROM tenant WHERE name='$tenant'),
'$email',
'$full_name')
ON CONFLICT (username) DO UPDATE SET local_passwd='$hashed_passwd', confirm_local_passwd='$hashed_passwd';
EOSQL

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/cdn-in-a-box/traffic_portal_integration_test/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ done

cat conf.js

protractor conf.js --params.adminUser 'admin' --params.adminPassword 'twelve'
protractor conf.js --params.adminUser "$TO_ADMIN_USER" --params.adminPassword "$TO_ADMIN_PASSWORD"
rc=$?

cp /portaltestresults/* /junit/
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/cdn-in-a-box/variables.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ TM_LOG_ERROR=stdout
TM_LOG_WARNING=stdout
TM_LOG_INFO=stdout
TM_LOG_DEBUG=stdout
TO_ADMIN_PASSWORD=twelve
TO_ADMIN_PASSWORD=twelve12
TO_ADMIN_USER=admin
TO_ADMIN_FULL_NAME=James Cole
# Set TM_DEBUG_ENABLE to true`to debug Traffic Monitor with Delve
TM_DEBUG_ENABLE=false
# Set TO_DEBUG_ENABLE to true`to debug Traffic Ops with Delve
Expand Down