Skip to content

Harden wolfsshd auth tests #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stenslae wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Harden wolfsshd auth tests #1115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 27 additions & 9 deletions apps/wolfsshd/test/test_configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,7 +1942,7 @@ static int test_AuthRaisePermissions_separateCallsSyscalls(void)
WOLFSSHD_AUTH* auth;
int (*savedEgid)(WGID_T);
int (*savedEuid)(WUID_T);
struct passwd* (*savedGetpwnam)(const char*);
struct passwd* (*savedGetpwnam)(const char*) = NULL;

conf = wolfSSHD_ConfigNew(NULL);
if (conf == NULL) {
Expand Down Expand Up @@ -1996,7 +1996,7 @@ static int test_AuthRaisePermissions_gidFailSkipsUid(void)
WOLFSSHD_AUTH* auth;
int (*savedEgid)(WGID_T);
int (*savedEuid)(WUID_T);
struct passwd* (*savedGetpwnam)(const char*);
struct passwd* (*savedGetpwnam)(const char*) = NULL;

conf = wolfSSHD_ConfigNew(NULL);
if (conf == NULL) {
Expand Down Expand Up @@ -2039,7 +2039,7 @@ static int test_AuthRaisePermissions_uidFail(void)
WOLFSSHD_AUTH* auth;
int (*savedEgid)(WGID_T);
int (*savedEuid)(WUID_T);
struct passwd* (*savedGetpwnam)(const char*);
struct passwd* (*savedGetpwnam)(const char*) = NULL;

conf = wolfSSHD_ConfigNew(NULL);
if (conf == NULL) {
Expand Down Expand Up @@ -2083,14 +2083,19 @@ static int test_AuthSetGroups_ok(void)
WOLFSSHD_AUTH* auth = NULL;
int (*savedGrouplist)(const char*, WGID_T, WGID_T*, int*);
int (*savedSetgroups)(int, const WGID_T*);
struct passwd* (*savedGetpwnam)(const char*) = wsshd_getpwnam_cb;

conf = wolfSSHD_ConfigNew(NULL);
if (conf == NULL)
ret = WS_FATAL_ERROR;
if (ret == WS_SUCCESS) {
InstallGetpwnamStub(&savedGetpwnam);
auth = wolfSSHD_AuthCreateUser(NULL, conf);
if (auth == NULL)
ret = WS_FATAL_ERROR;
if (auth == NULL) {
wsshd_getpwnam_cb = savedGetpwnam;
wolfSSHD_ConfigFree(conf);
return WS_FATAL_ERROR;
}
}

InstallGroupStubs(0, &savedGrouplist, &savedSetgroups);
Expand Down Expand Up @@ -2120,6 +2125,7 @@ static int test_AuthSetGroups_ok(void)

wsshd_getgrouplist_cb = savedGrouplist;
wsshd_setgroups_cb = savedSetgroups;
wsshd_getpwnam_cb = savedGetpwnam;
Comment thread
stenslae marked this conversation as resolved.
if (auth != NULL)
(void)wolfSSHD_AuthFreeUser(auth);
if (conf != NULL)
Expand All @@ -2136,14 +2142,19 @@ static int test_AuthSetGroups_setgroups_fail(void)
WOLFSSHD_AUTH* auth = NULL;
int (*savedGrouplist)(const char*, WGID_T, WGID_T*, int*);
int (*savedSetgroups)(int, const WGID_T*);
struct passwd* (*savedGetpwnam)(const char*) = wsshd_getpwnam_cb;

conf = wolfSSHD_ConfigNew(NULL);
if (conf == NULL)
ret = WS_FATAL_ERROR;
if (ret == WS_SUCCESS) {
InstallGetpwnamStub(&savedGetpwnam);
auth = wolfSSHD_AuthCreateUser(NULL, conf);
if (auth == NULL)
ret = WS_FATAL_ERROR;
if (auth == NULL) {
wsshd_getpwnam_cb = savedGetpwnam;
wolfSSHD_ConfigFree(conf);
return WS_FATAL_ERROR;
}
}

InstallGroupStubs(-1, &savedGrouplist, &savedSetgroups);
Expand All @@ -2156,6 +2167,7 @@ static int test_AuthSetGroups_setgroups_fail(void)

wsshd_getgrouplist_cb = savedGrouplist;
wsshd_setgroups_cb = savedSetgroups;
wsshd_getpwnam_cb = savedGetpwnam;
if (auth != NULL)
(void)wolfSSHD_AuthFreeUser(auth);
if (conf != NULL)
Expand All @@ -2172,14 +2184,19 @@ static int test_AuthSetGroups_getgrouplist_fail(void)
WOLFSSHD_AUTH* auth = NULL;
int (*savedGrouplist)(const char*, WGID_T, WGID_T*, int*);
int (*savedSetgroups)(int, const WGID_T*);
struct passwd* (*savedGetpwnam)(const char*) = wsshd_getpwnam_cb;

conf = wolfSSHD_ConfigNew(NULL);
if (conf == NULL)
ret = WS_FATAL_ERROR;
if (ret == WS_SUCCESS) {
InstallGetpwnamStub(&savedGetpwnam);
auth = wolfSSHD_AuthCreateUser(NULL, conf);
if (auth == NULL)
ret = WS_FATAL_ERROR;
if (auth == NULL) {
wsshd_getpwnam_cb = savedGetpwnam;
wolfSSHD_ConfigFree(conf);
return WS_FATAL_ERROR;
}
}

InstallGroupStubs(0, &savedGrouplist, &savedSetgroups);
Expand All @@ -2194,6 +2211,7 @@ static int test_AuthSetGroups_getgrouplist_fail(void)

wsshd_getgrouplist_cb = savedGrouplist;
wsshd_setgroups_cb = savedSetgroups;
wsshd_getpwnam_cb = savedGetpwnam;
if (auth != NULL)
(void)wolfSSHD_AuthFreeUser(auth);
if (conf != NULL)
Expand Down
Loading