Skip to content

Commit c06a11b

Browse files
authored
Merge pull request #89 from WebFuzzing/ocvn-add-user
Adding a new user to ocvn.
2 parents 2d288c2 + 04f3117 commit c06a11b

File tree

4 files changed

+79
-13
lines changed

4 files changed

+79
-13
lines changed

jdk_8_maven/em/embedded/rest/ocvn/src/main/java/em/embedded/org/devgateway/ocvn/EmbeddedEvoMasterController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ public void resetStateOfSUT() {
146146

147147
@Override
148148
public List<AuthenticationDto> getInfoForAuthentication() {
149-
return Arrays.asList(AuthUtils.getForDefaultSpringFormLogin("ADMIN", "admin", "admin"));
149+
150+
return Arrays.asList(
151+
AuthUtils.getForDefaultSpringFormLogin("ADMIN", "admin", "admin"),
152+
AuthUtils.getForDefaultSpringFormLogin("user1", "user1", "password"));
150153
}
151154

152155

jdk_8_maven/em/embedded/rest/ocvn/src/main/resources/init_db.sql

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,37 @@ VALUES
3333
'admin',
3434
NULL
3535
);
36+
-- Adding a new user called user1 with password "password". User details are stored in the database.
37+
INSERT INTO PERSON
38+
(
39+
CHANGE_PASSWORD,
40+
COUNTRY,
41+
EMAIL,
42+
ENABLED,
43+
FIRST_NAME,
44+
LAST_NAME,
45+
PASSWORD,
46+
TITLE,
47+
USERNAME,
48+
GROUP_ID
49+
)
50+
VALUES
51+
(
52+
false,
53+
NULL,
54+
NULL,
55+
true,
56+
NULL,
57+
NULL,
58+
'b65d4278fb536a6e1ea23c87988f5d79ef743ccb07b2067ad8ebd52f1a0c067e5bc3b7f76eca3abc',
59+
NULL,
60+
'user1',
61+
NULL
62+
);
3663

3764
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,2);
3865
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,1);
3966
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,3);
67+
68+
-- user1 has user privilege only
69+
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(2,1);

jdk_8_maven/em/external/rest/ocvn/src/main/java/em/external/org/devgateway/ocvn/ExternalEvoMasterController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,10 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
239239

240240
@Override
241241
public List<AuthenticationDto> getInfoForAuthentication() {
242-
return Arrays.asList(AuthUtils.getForDefaultSpringFormLogin("ADMIN", "admin", "admin"));
242+
243+
return Arrays.asList(
244+
AuthUtils.getForDefaultSpringFormLogin("ADMIN", "admin", "admin"),
245+
AuthUtils.getForDefaultSpringFormLogin("user1", "user1", "password"));
243246
}
244247

245248

jdk_8_maven/em/external/rest/ocvn/src/main/resources/init_db.sql

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,48 @@ INSERT INTO PERSON
2222
)
2323
VALUES
2424
(
25-
false,
26-
NULL,
27-
NULL,
28-
true,
29-
NULL,
30-
NULL,
31-
'61f3d99fb8ddfa54b714e84a0238e575930fda10e09dbd030b92edf1cf77c4d947e506e26ae9bf33',
32-
NULL,
33-
'admin',
34-
NULL
35-
);
25+
false,
26+
NULL,
27+
NULL,
28+
true,
29+
NULL,
30+
NULL,
31+
'61f3d99fb8ddfa54b714e84a0238e575930fda10e09dbd030b92edf1cf77c4d947e506e26ae9bf33',
32+
NULL,
33+
'admin',
34+
NULL
35+
);
36+
-- Adding a new user called user1 with password "password". User details are stored in the database.
37+
INSERT INTO PERSON
38+
(
39+
CHANGE_PASSWORD,
40+
COUNTRY,
41+
EMAIL,
42+
ENABLED,
43+
FIRST_NAME,
44+
LAST_NAME,
45+
PASSWORD,
46+
TITLE,
47+
USERNAME,
48+
GROUP_ID
49+
)
50+
VALUES
51+
(
52+
false,
53+
NULL,
54+
NULL,
55+
true,
56+
NULL,
57+
NULL,
58+
'b65d4278fb536a6e1ea23c87988f5d79ef743ccb07b2067ad8ebd52f1a0c067e5bc3b7f76eca3abc',
59+
NULL,
60+
'user1',
61+
NULL
62+
);
3663

3764
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,2);
3865
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,1);
3966
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,3);
67+
68+
-- user1 has user privilege only
69+
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(2,1);

0 commit comments

Comments
 (0)