diff --git a/.github/actions/to-api-contract-tests/entrypoint.sh b/.github/actions/to-api-contract-tests/entrypoint.sh index 59f74c9159..b3a8ffb380 100755 --- a/.github/actions/to-api-contract-tests/entrypoint.sh +++ b/.github/actions/to-api-contract-tests/entrypoint.sh @@ -122,4 +122,4 @@ truncate --size=0 traffic.ops.log # Removes output from previous API versions an cd "../testing/api_contract/v$INPUT_VERSION" -pytest -rA --to-user admin --to-password twelve12 --to-url https://localhost:6443/api/4.0 +pytest -rA --to-user admin --to-password twelve --to-url https://localhost:6443/api/4.0 diff --git a/dev/README.md b/dev/README.md index 7455d815de..d83c727f2b 100644 --- a/dev/README.md +++ b/dev/README.md @@ -32,7 +32,7 @@ self-signed certificate, so `curl` commands to the API will need to use debugger for Go listens on port 6444 for connections to debug Traffic Ops. The login credentials for the "admin" user are the same as those for the user of -the same name in CDN-in-a-Box - password is `twelve12`. +the same name in CDN-in-a-Box - password is `twelve`. ## Traffic Portal The current version of Traffic Portal serves using HTTPS on port 444. The @@ -60,9 +60,9 @@ for running Postgres, so any Postgres servers running on the host machine may need to be stopped before running ATC) and houses the Traffic Ops database as `traffic_ops_development`, and the Traffic Vault database as `traffic_vault_development`. To connect as the Traffic Ops user to the Traffic -Ops database, use the username `traffic_ops` and the password `twelve12`. To +Ops database, use the username `traffic_ops` and the password `twelve`. To connect as the Traffic Ops Vault user to the Traffic Vault database, use the -username `traffic_vault` and the password `twelve12`. +username `traffic_vault` and the password `twelve`. ## T3C An edge-tier cache server listens for HTTP (HTTPS not supported) connections on diff --git a/dev/atc.dev.sh b/dev/atc.dev.sh index 128f3e52c6..8308b48b36 100644 --- a/dev/atc.dev.sh +++ b/dev/atc.dev.sh @@ -177,4 +177,4 @@ function tm-health-client { export TO_URL="https://localhost:6443" export TO_USER="admin" -export TO_PASSWORD="twelve12" +export TO_PASSWORD="twelve" diff --git a/dev/traffic_monitor/ops.config.json b/dev/traffic_monitor/ops.config.json index e540e04b5e..0e85962039 100644 --- a/dev/traffic_monitor/ops.config.json +++ b/dev/traffic_monitor/ops.config.json @@ -1,6 +1,6 @@ { "username": "admin", - "password": "twelve12", + "password": "twelve", "url": "https://trafficops:443/", "insecure": true, "cdnName": "dev", diff --git a/dev/traffic_ops/.pgpass b/dev/traffic_ops/.pgpass index a33d63bbe5..06811acd7b 100644 --- a/dev/traffic_ops/.pgpass +++ b/dev/traffic_ops/.pgpass @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -db:5432:postgres:postgres:twelve12 +db:5432:postgres:postgres:twelve diff --git a/dev/traffic_ops/cdn.json b/dev/traffic_ops/cdn.json index 171fb7cd23..4a97528018 100644 --- a/dev/traffic_ops/cdn.json +++ b/dev/traffic_ops/cdn.json @@ -19,7 +19,7 @@ "query_timeout_seconds": 86400, "hostname": "db", "user": "traffic_vault", - "password": "twelve12", + "password": "twelve", "port": 5432 }, "read_timeout": 86400, diff --git a/dev/traffic_ops/db.config.json b/dev/traffic_ops/db.config.json index 572b1a05eb..a52ebbfe39 100644 --- a/dev/traffic_ops/db.config.json +++ b/dev/traffic_ops/db.config.json @@ -3,7 +3,7 @@ "dbname": "traffic_ops_development", "hostname": "db", "user": "traffic_ops", - "password": "twelve12", + "password": "twelve", "port": "5432", "ssl": false, "type": "Pg" diff --git a/dev/traffic_ops/dbconf.yml b/dev/traffic_ops/dbconf.yml index 8d7f8d16bd..dcc6659289 100644 --- a/dev/traffic_ops/dbconf.yml +++ b/dev/traffic_ops/dbconf.yml @@ -18,4 +18,4 @@ name: dbconf.yml development: driver: postgres - open: host=db port=5432 user=traffic_ops password=twelve12 dbname=traffic_ops_development sslmode=disable + open: host=db port=5432 user=traffic_ops password=twelve dbname=traffic_ops_development sslmode=disable diff --git a/dev/traffic_ops/run.sh b/dev/traffic_ops/run.sh index dea6a4f7f0..ab584735f4 100755 --- a/dev/traffic_ops/run.sh +++ b/dev/traffic_ops/run.sh @@ -36,7 +36,7 @@ db_init() { "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" reset "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" upgrade - psql -d 'postgres://traffic_ops:twelve12@db:5432/traffic_ops_development?sslmode=disable' -f ./seed.psql + psql -d 'postgres://traffic_ops:twelve@db:5432/traffic_ops_development?sslmode=disable' -f ./seed.psql ) } diff --git a/dev/traffic_ops/seed.psql b/dev/traffic_ops/seed.psql index 9ae985aaae..6eb08dcb09 100644 --- a/dev/traffic_ops/seed.psql +++ b/dev/traffic_ops/seed.psql @@ -23,7 +23,7 @@ INSERT INTO tm_user ( 'admin', (SELECT id FROM tenant WHERE "name" = 'root'), (SELECT id FROM "role" WHERE "name" = 'admin'), - -- 'twelve12' encrypted with SCRYPT + -- 'twelve' encrypted with SCRYPT 'SCRYPT:16384:8:1:p0Bppp/6IBeYxSwdLuYddsdMLBU/BNSlLY6fSIF7H1XW4eTbNVeMPVm7TuTEG4FM8PbqLlVwi8sPy8ZJznAlaQ==:sRcHWGe43mm/uEmXTIw37GcLEQZTlWAdf4vJqK8f0MDh8P+8gXoNx+nxWyb3r/0Bh+yyg0g/dUvti/ePZJL+Jw==', 'SCRYPT:16384:8:1:p0Bppp/6IBeYxSwdLuYddsdMLBU/BNSlLY6fSIF7H1XW4eTbNVeMPVm7TuTEG4FM8PbqLlVwi8sPy8ZJznAlaQ==:sRcHWGe43mm/uEmXTIw37GcLEQZTlWAdf4vJqK8f0MDh8P+8gXoNx+nxWyb3r/0Bh+yyg0g/dUvti/ePZJL+Jw==', 'admin@no-reply.atc.test', diff --git a/dev/traffic_ops/traffic.vault.dbconf.yml b/dev/traffic_ops/traffic.vault.dbconf.yml index 8610e43da5..c19d3f595e 100644 --- a/dev/traffic_ops/traffic.vault.dbconf.yml +++ b/dev/traffic_ops/traffic.vault.dbconf.yml @@ -18,4 +18,4 @@ name: traffic.vault.dbconf.yml development: driver: postgres - open: host=db port=5432 user=traffic_vault password=twelve12 dbname=traffic_vault_development sslmode=disable + open: host=db port=5432 user=traffic_vault password=twelve dbname=traffic_vault_development sslmode=disable diff --git a/dev/traffic_router/conf/traffic_ops.properties b/dev/traffic_router/conf/traffic_ops.properties index 80d9b01154..5448d176ab 100644 --- a/dev/traffic_router/conf/traffic_ops.properties +++ b/dev/traffic_router/conf/traffic_ops.properties @@ -10,4 +10,4 @@ # See the License for the specific language governing permissions and # limitations under the License. traffic_ops.username=admin -traffic_ops.password=twelve12 +traffic_ops.password=twelve diff --git a/docker-compose.yml b/docker-compose.yml index d9da0325cc..1197f5d80a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: ports: - 5432:5432 environment: - - POSTGRES_PASSWORD=twelve12 + - POSTGRES_PASSWORD=twelve hostname: db networks: - ciab diff --git a/docs/source/development/debugging.rst b/docs/source/development/debugging.rst index ffb7b9308b..39383c2e6d 100644 --- a/docs/source/development/debugging.rst +++ b/docs/source/development/debugging.rst @@ -136,7 +136,7 @@ Wait for Traffic Monitor to start, which will indicate that the SSL keys have be .. code-block:: shell :caption: Run ``t3c-apply`` with debugging enabled - [user@computer cdn-in-a-box]$ mydc exec edge t3c apply --run-mode=badass --traffic-ops-url=https://trafficops.infra.ciab.test --traffic-ops-user=admin --traffic-ops-password=twelve12 --git=yes --dispersion=0 --log-location-error=stdout --log-location-warning=stdout --log-location-info=stdout all + [user@computer cdn-in-a-box]$ mydc exec edge t3c apply --run-mode=badass --traffic-ops-url=https://trafficops.infra.ciab.test --traffic-ops-user=admin --traffic-ops-password=twelve --git=yes --dispersion=0 --log-location-error=stdout --log-location-warning=stdout --log-location-info=stdout all API server listening at: [::]:2347 The *API server listening* message is from ``dlv``, indicating it is ready to accept a connection from your IDE. Note that, unlike the other components, execution of ``t3c`` does not begin until your IDE connects to ``dlv``. @@ -203,7 +203,7 @@ Wait for Traffic Monitor to start, which will indicate that the SSL keys have be .. code-block:: shell :caption: Run ``t3c-apply`` with debugging enabled - [user@computer cdn-in-a-box]$ mydc exec mid-01 t3c apply --run-mode=badass --traffic-ops-url=https://trafficops.infra.ciab.test --traffic-ops-user=admin --traffic-ops-password=twelve12 --git=yes --dispersion=0 --log-location-error=stdout --log-location-warning=stdout --log-location-info=stdout all + [user@computer cdn-in-a-box]$ mydc exec mid-01 t3c apply --run-mode=badass --traffic-ops-url=https://trafficops.infra.ciab.test --traffic-ops-user=admin --traffic-ops-password=twelve --git=yes --dispersion=0 --log-location-error=stdout --log-location-warning=stdout --log-location-info=stdout all API server listening at: [::]:2348 The *API server listening* message is from ``dlv``, indicating it is ready to accept a connection from your IDE. Note that, unlike the other components, execution of ``t3c`` does not begin until your IDE connects to ``dlv``. @@ -270,7 +270,7 @@ Wait for Traffic Monitor to start, which will indicate that the SSL keys have be .. code-block:: shell :caption: Run ``t3c-apply`` with debugging enabled - [user@computer cdn-in-a-box]$ mydc exec mid-02 t3c apply --run-mode=badass --traffic-ops-url=https://trafficops.infra.ciab.test --traffic-ops-user=admin --traffic-ops-password=twelve12 --git=yes --dispersion=0 --log-location-error=stdout --log-location-warning=stdout --log-location-info=stdout all + [user@computer cdn-in-a-box]$ mydc exec mid-02 t3c apply --run-mode=badass --traffic-ops-url=https://trafficops.infra.ciab.test --traffic-ops-user=admin --traffic-ops-password=twelve --git=yes --dispersion=0 --log-location-error=stdout --log-location-warning=stdout --log-location-info=stdout all API server listening at: [::]:2349 The *API server listening* message is from ``dlv``, indicating it is ready to accept a connection from your IDE. Note that, unlike the other components, execution of ``t3c`` does not begin until your IDE connects to ``dlv``. diff --git a/experimental/traffic-portal/nightwatch/config.json b/experimental/traffic-portal/nightwatch/config.json index c82b5a0e28..e93843599e 100644 --- a/experimental/traffic-portal/nightwatch/config.json +++ b/experimental/traffic-portal/nightwatch/config.json @@ -1,5 +1,5 @@ { - "adminPass": "twelve12", + "adminPass": "twelve", "adminUser": "admin", "disableColors": false, "retryAssertionTimeoutMS": 5000, diff --git a/experimental/traffic-portal/src/app/api/testing/user.service.ts b/experimental/traffic-portal/src/app/api/testing/user.service.ts index 607e9f3ebe..4481dbb878 100644 --- a/experimental/traffic-portal/src/app/api/testing/user.service.ts +++ b/experimental/traffic-portal/src/app/api/testing/user.service.ts @@ -48,7 +48,7 @@ export class UserService { private lastID = 0; private testAdminUsername = "test-admin"; - private readonly testAdminPassword = "twelve12!"; + private readonly testAdminPassword = "twelve!"; private readonly users: Array = [ { addressLine1: null, diff --git a/experimental/traffic-portal/src/app/login/login.component.spec.ts b/experimental/traffic-portal/src/app/login/login.component.spec.ts index aac736a15a..4c7b80d982 100644 --- a/experimental/traffic-portal/src/app/login/login.component.spec.ts +++ b/experimental/traffic-portal/src/app/login/login.component.spec.ts @@ -34,14 +34,14 @@ describe("LoginComponent", () => { beforeEach(() => { mockCurrentUserService = jasmine.createSpyObj(["updateCurrentUser", "login", "logout"]); - mockCurrentUserService.login.and.callFake(async (u, p)=>u === "test-admin" && p === "twelve12!"); + mockCurrentUserService.login.and.callFake(async (u, p)=>u === "test-admin" && p === "twelve!"); mockCurrentUserService.login.withArgs("tok").and.returnValue(new Promise(r=>r(true))); mockCurrentUserService.login.withArgs("badToken").and.callFake( async () => { throw new Error("bad token"); } ); - mockCurrentUserService.login.withArgs("server error", "twelve12!").and.callFake( + mockCurrentUserService.login.withArgs("server error", "twelve!").and.callFake( async () => { throw new Error("some kind of server error occurred"); } @@ -91,7 +91,7 @@ describe("LoginComponent", () => { await expectAsync(component.submitLogin()).toBeRejected(); expect(mockCurrentUserService.login).not.toHaveBeenCalled(); component.u = "test-admin"; - component.p = "twelve12!"; + component.p = "twelve!"; component.submitLogin(); expect(mockCurrentUserService.login).toHaveBeenCalled(); component.u = "server error"; diff --git a/experimental/traffic-portal/src/app/shared/current-user/current-user.service.spec.ts b/experimental/traffic-portal/src/app/shared/current-user/current-user.service.spec.ts index d62158733c..44d063e19c 100644 --- a/experimental/traffic-portal/src/app/shared/current-user/current-user.service.spec.ts +++ b/experimental/traffic-portal/src/app/shared/current-user/current-user.service.spec.ts @@ -227,7 +227,7 @@ describe("CurrentUserService", () => { }); it("logs users in", async () => { - expect(await service.login("test-admin", "twelve12!")).toBeTrue(); + expect(await service.login("test-admin", "twelve!")).toBeTrue(); expect(await service.login("test-admin", "a misspelled password")).toBeFalse(); expect(await service.login("there's no token that includes apostrophes")).toBeFalse(); }); diff --git a/experimental/traffic-portal/src/app/shared/current-user/current-user.testing-service.spec.ts b/experimental/traffic-portal/src/app/shared/current-user/current-user.testing-service.spec.ts index 52ab6eb70e..8e017fee7c 100644 --- a/experimental/traffic-portal/src/app/shared/current-user/current-user.testing-service.spec.ts +++ b/experimental/traffic-portal/src/app/shared/current-user/current-user.testing-service.spec.ts @@ -22,13 +22,13 @@ import { LoggingService } from "../logging.service"; * * The authenticated user it "manages" is perpetually authenticated, but logging * in can fail - it expects the credentials to match the existing currentUser's - * username with the password 'twelve12!' (determined by the static 'PASSWORD' + * username with the password 'twelve!' (determined by the static 'PASSWORD' * property of the service). */ @Injectable() export class CurrentUserTestingService { public static readonly ADMIN_ROLE = "admin"; - public static readonly PASSWORD = "twelve12!"; + public static readonly PASSWORD = "twelve!"; public userChanged = new EventEmitter(); public currentUser: ResponseCurrentUser = { addressLine1: null, diff --git a/infrastructure/cdn-in-a-box/health/to-creds b/infrastructure/cdn-in-a-box/health/to-creds index 84a97438a8..c6ff7dd086 100644 --- a/infrastructure/cdn-in-a-box/health/to-creds +++ b/infrastructure/cdn-in-a-box/health/to-creds @@ -20,4 +20,4 @@ export TO_URL="https://trafficops.infra.ciab.test:443" export TO_USER="admin" -export TO_PASS="twelve12" \ No newline at end of file +export TO_PASS="twelve" \ No newline at end of file diff --git a/infrastructure/cdn-in-a-box/variables.env b/infrastructure/cdn-in-a-box/variables.env index e1a40cad67..908eb37c3f 100644 --- a/infrastructure/cdn-in-a-box/variables.env +++ b/infrastructure/cdn-in-a-box/variables.env @@ -80,7 +80,7 @@ TM_LOG_WARNING=stdout TM_LOG_INFO=stdout TM_LOG_DEBUG=stdout TCH_HOST=tchealthclient -TO_ADMIN_PASSWORD=twelve12 +TO_ADMIN_PASSWORD=twelve TO_ADMIN_USER=admin TO_ADMIN_FULL_NAME='Fabi Dias' # Set ENROLLER_DEBUG_ENABLE to true`to debug the enroller with Delve diff --git a/traffic_ops/testing/api/conf/traffic-ops-test.conf b/traffic_ops/testing/api/conf/traffic-ops-test.conf index 1143dc0979..4ec749c9f6 100644 --- a/traffic_ops/testing/api/conf/traffic-ops-test.conf +++ b/traffic_ops/testing/api/conf/traffic-ops-test.conf @@ -31,7 +31,7 @@ "dbname": "traffic_ops_development", "description": "dev database traffic_ops_development", "hostname": "localhost", - "password": "twelve12", + "password": "twelve", "port": "5432", "type": "Pg", "user": "traffic_ops" diff --git a/traffic_ops/testing/api_contract/v4/data/to_data.json b/traffic_ops/testing/api_contract/v4/data/to_data.json index 36dde135d8..59cb815afe 100644 --- a/traffic_ops/testing/api_contract/v4/data/to_data.json +++ b/traffic_ops/testing/api_contract/v4/data/to_data.json @@ -1,6 +1,6 @@ { "user": "admin", - "password": "twelve12", + "password": "twelve", "url": "https://localhost/api/4.0", "port": 443, "db_name":"traffic_ops", diff --git a/traffic_portal/test/integration/config.json b/traffic_portal/test/integration/config.json index 2568e925bb..7c090f4af7 100644 --- a/traffic_portal/test/integration/config.json +++ b/traffic_portal/test/integration/config.json @@ -33,7 +33,7 @@ "baseUrl": "https://localhost", "login": { "username": "admin", - "password": "twelve12" + "password": "twelve" }, "junitReporter": false }