Skip to content

Commit 4cecf8c

Browse files
committed
Use "twelve" as the password where "twelve12" was used
1 parent 9262261 commit 4cecf8c

File tree

20 files changed

+29
-29
lines changed

20 files changed

+29
-29
lines changed

dev/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ self-signed certificate, so `curl` commands to the API will need to use
3232
debugger for Go listens on port 6444 for connections to debug Traffic Ops.
3333

3434
The login credentials for the "admin" user are the same as those for the user of
35-
the same name in CDN-in-a-Box - password is `twelve12`.
35+
the same name in CDN-in-a-Box - password is `twelve`.
3636

3737
## Traffic Portal
3838
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
6060
need to be stopped before running ATC) and houses the Traffic Ops database as
6161
`traffic_ops_development`, and the Traffic Vault database as
6262
`traffic_vault_development`. To connect as the Traffic Ops user to the Traffic
63-
Ops database, use the username `traffic_ops` and the password `twelve12`. To
63+
Ops database, use the username `traffic_ops` and the password `twelve`. To
6464
connect as the Traffic Ops Vault user to the Traffic Vault database, use the
65-
username `traffic_vault` and the password `twelve12`.
65+
username `traffic_vault` and the password `twelve`.
6666

6767
## T3C
6868
An edge-tier cache server listens for HTTP (HTTPS not supported) connections on

dev/atc.dev.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,4 @@ function tm-health-client {
177177

178178
export TO_URL="https://localhost:6443"
179179
export TO_USER="admin"
180-
export TO_PASSWORD="twelve12"
180+
export TO_PASSWORD="twelve"

dev/traffic_monitor/ops.config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"username": "admin",
3-
"password": "twelve12",
3+
"password": "twelve",
44
"url": "https://trafficops:443/",
55
"insecure": true,
66
"cdnName": "dev",

dev/traffic_ops/.pgpass

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
db:5432:postgres:postgres:twelve12
17+
db:5432:postgres:postgres:twelve

dev/traffic_ops/cdn.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"query_timeout_seconds": 86400,
2222
"hostname": "db",
2323
"user": "traffic_vault",
24-
"password": "twelve12",
24+
"password": "twelve",
2525
"port": 5432
2626
},
2727
"read_timeout": 86400,

dev/traffic_ops/db.config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dbname": "traffic_ops_development",
44
"hostname": "db",
55
"user": "traffic_ops",
6-
"password": "twelve12",
6+
"password": "twelve",
77
"port": "5432",
88
"ssl": false,
99
"type": "Pg"

dev/traffic_ops/dbconf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ name: dbconf.yml
1818

1919
development:
2020
driver: postgres
21-
open: host=db port=5432 user=traffic_ops password=twelve12 dbname=traffic_ops_development sslmode=disable
21+
open: host=db port=5432 user=traffic_ops password=twelve dbname=traffic_ops_development sslmode=disable

dev/traffic_ops/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cd "$TC/dev/traffic_ops"
3333
"$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
3434
"$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
3535

36-
psql -d 'postgres://traffic_ops:twelve12@db:5432/traffic_ops_development?sslmode=disable' -f ./seed.psql
36+
psql -d 'postgres://traffic_ops:twelve@db:5432/traffic_ops_development?sslmode=disable' -f ./seed.psql
3737

3838
cd "$TC/traffic_ops/traffic_ops_golang"
3939

dev/traffic_ops/seed.psql

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ INSERT INTO tm_user (
2323
'admin',
2424
(SELECT id FROM tenant WHERE "name" = 'root'),
2525
(SELECT id FROM "role" WHERE "name" = 'admin'),
26-
-- 'twelve12' encrypted with SCRYPT
27-
'SCRYPT:16384:8:1:p0Bppp/6IBeYxSwdLuYddsdMLBU/BNSlLY6fSIF7H1XW4eTbNVeMPVm7TuTEG4FM8PbqLlVwi8sPy8ZJznAlaQ==:sRcHWGe43mm/uEmXTIw37GcLEQZTlWAdf4vJqK8f0MDh8P+8gXoNx+nxWyb3r/0Bh+yyg0g/dUvti/ePZJL+Jw==',
28-
'SCRYPT:16384:8:1:p0Bppp/6IBeYxSwdLuYddsdMLBU/BNSlLY6fSIF7H1XW4eTbNVeMPVm7TuTEG4FM8PbqLlVwi8sPy8ZJznAlaQ==:sRcHWGe43mm/uEmXTIw37GcLEQZTlWAdf4vJqK8f0MDh8P+8gXoNx+nxWyb3r/0Bh+yyg0g/dUvti/ePZJL+Jw==',
26+
-- 'twelve' encrypted with SCRYPT
27+
'SCRYPT:16384:8:1:e0Qvo+Y/R1NTeDnXjcWg14KJhriHqMPL581e4cZZsBSrHNoclSWaySzwqrvnPZi9pvx1r7HgftWhnAy0hq0HpQ==:4XeiJ+8+IoX9oHkvGtlBRSah/NDI3ovne/rgW0kF9n5UPnKOPkoXurhVC/KP9JSoAbVEXAY9ZZRitOw/40yIUw==',
28+
'SCRYPT:16384:8:1:e0Qvo+Y/R1NTeDnXjcWg14KJhriHqMPL581e4cZZsBSrHNoclSWaySzwqrvnPZi9pvx1r7HgftWhnAy0hq0HpQ==:4XeiJ+8+IoX9oHkvGtlBRSah/NDI3ovne/rgW0kF9n5UPnKOPkoXurhVC/KP9JSoAbVEXAY9ZZRitOw/40yIUw==',
2929
3030
'Development Admin User'
3131
)

dev/traffic_ops/traffic.vault.dbconf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ name: traffic.vault.dbconf.yml
1818

1919
development:
2020
driver: postgres
21-
open: host=db port=5432 user=traffic_vault password=twelve12 dbname=traffic_vault_development sslmode=disable
21+
open: host=db port=5432 user=traffic_vault password=twelve dbname=traffic_vault_development sslmode=disable

dev/traffic_router/conf/traffic_ops.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# See the License for the specific language governing permissions and
1111
# limitations under the License.
1212
traffic_ops.username=admin
13-
traffic_ops.password=twelve12
13+
traffic_ops.password=twelve

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ services:
4141
ports:
4242
- 5432:5432
4343
environment:
44-
- POSTGRES_PASSWORD=twelve12
44+
- POSTGRES_PASSWORD=twelve
4545
hostname: db
4646
networks:
4747
- ciab

docs/source/development/debugging.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Wait for Traffic Monitor to start, which will indicate that the SSL keys have be
136136
.. code-block:: shell
137137
:caption: Run ``t3c-apply`` with debugging enabled
138138
139-
[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
139+
[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
140140
API server listening at: [::]:2347
141141
142142
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
203203
.. code-block:: shell
204204
:caption: Run ``t3c-apply`` with debugging enabled
205205
206-
[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
206+
[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
207207
API server listening at: [::]:2348
208208
209209
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
270270
.. code-block:: shell
271271
:caption: Run ``t3c-apply`` with debugging enabled
272272
273-
[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
273+
[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
274274
API server listening at: [::]:2349
275275
276276
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``.

experimental/traffic-portal/nightwatch/globals/globals.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export interface CreatedData {
7979
}
8080

8181
const globals = {
82-
adminPass: "twelve12",
82+
adminPass: "twelve",
8383
adminUser: "admin",
8484
afterEach: (browser: NightwatchBrowser, done: () => void): void => {
8585
browser.end(() => {

experimental/traffic-portal/src/app/api/testing/user.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class UserService {
4343
private lastID = 0;
4444

4545
private testAdminUsername = "test-admin";
46-
private readonly testAdminPassword = "twelve12!";
46+
private readonly testAdminPassword = "twelve!";
4747
private readonly users: Array<GetResponseUser> = [
4848
{
4949
addressLine1: null,

experimental/traffic-portal/src/app/login/login.component.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ describe("LoginComponent", () => {
3434

3535
beforeEach(() => {
3636
mockCurrentUserService = jasmine.createSpyObj(["updateCurrentUser", "login", "logout"]);
37-
mockCurrentUserService.login.and.callFake(async (u, p)=>u === "test-admin" && p === "twelve12!");
37+
mockCurrentUserService.login.and.callFake(async (u, p)=>u === "test-admin" && p === "twelve!");
3838
mockCurrentUserService.login.withArgs("tok").and.returnValue(new Promise(r=>r(true)));
3939
mockCurrentUserService.login.withArgs("badToken").and.callFake(
4040
async () => {
4141
throw new Error("bad token");
4242
}
4343
);
44-
mockCurrentUserService.login.withArgs("server error", "twelve12!").and.callFake(
44+
mockCurrentUserService.login.withArgs("server error", "twelve!").and.callFake(
4545
async () => {
4646
throw new Error("some kind of server error occurred");
4747
}
@@ -94,7 +94,7 @@ describe("LoginComponent", () => {
9494
await expectAsync(component.submitLogin()).toBeRejected();
9595
expect(mockCurrentUserService.login).not.toHaveBeenCalled();
9696
component.u = "test-admin";
97-
component.p = "twelve12!";
97+
component.p = "twelve!";
9898
component.submitLogin();
9999
expect(mockCurrentUserService.login).toHaveBeenCalled();
100100
component.u = "server error";

experimental/traffic-portal/src/app/shared/currentUser/current-user.service.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ describe("CurrentUserService", () => {
183183
});
184184

185185
it("logs users in", async () => {
186-
expect(await service.login("test-admin", "twelve12!")).toBeTrue();
186+
expect(await service.login("test-admin", "twelve!")).toBeTrue();
187187
expect(await service.login("test-admin", "a misspelled password")).toBeFalse();
188188
expect(await service.login("there's no token that includes apostrophes")).toBeFalse();
189189
});

experimental/traffic-portal/src/app/shared/currentUser/current-user.testing-service.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import { ADMIN_ROLE, Capability, CurrentUser } from "src/app/models";
2121
*
2222
* The authenticated user it "manages" is perpetually authenticated, but logging
2323
* in can fail - it expects the credentials to match the existing currentUser's
24-
* username with the password 'twelve12!' (determined by the static 'PASSWORD'
24+
* username with the password 'twelve!' (determined by the static 'PASSWORD'
2525
* property of the service).
2626
*/
2727
@Injectable()
2828
export class CurrentUserTestingService {
29-
public static readonly PASSWORD = "twelve12!";
29+
public static readonly PASSWORD = "twelve!";
3030
public userChanged = new EventEmitter<CurrentUser>();
3131
public currentUser: CurrentUser = {
3232
addressLine1: null,

infrastructure/cdn-in-a-box/variables.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ TM_LOG_ERROR=stdout
7979
TM_LOG_WARNING=stdout
8080
TM_LOG_INFO=stdout
8181
TM_LOG_DEBUG=stdout
82-
TO_ADMIN_PASSWORD=twelve12
82+
TO_ADMIN_PASSWORD=twelve
8383
TO_ADMIN_USER=admin
8484
TO_ADMIN_FULL_NAME='James Cole'
8585
# Set ENROLLER_DEBUG_ENABLE to true`to debug the enroller with Delve

traffic_portal/test/integration/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"baseUrl": "https://localhost",
3434
"login": {
3535
"username": "admin",
36-
"password": "twelve12"
36+
"password": "twelve"
3737
},
3838
"junitReporter": false
3939
}

0 commit comments

Comments
 (0)