Skip to content

Reorder log message in auth.c #1175

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

Merged
ejohnstown merged 1 commit into from
Aug 18, 2026
Merged

Reorder log message in auth.c #1175

Show file tree
Hide file tree
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
17 changes: 9 additions & 8 deletions apps/wolfsshd/auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,8 +1099,8 @@ int wolfSSHD_OpenSecureFile(const char* path, WUID_T ownerUid,
* attacker-chosen target. */
if (lstat(path, &lst) != 0 || !S_ISREG(lst.st_mode)) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Refusing to load %s: missing, not a regular file, or a "
"symlink", path);
"[SSHD] Refusing to load (missing, not a regular file, or a "
"symlink): %s", path);
ret = WS_BAD_FILE_E;
}

Expand Down Expand Up @@ -1146,28 +1146,29 @@ int wolfSSHD_OpenSecureFile(const char* path, WUID_T ownerUid,
if (ret == WS_SUCCESS) {
if (!S_ISREG(st.st_mode)) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Refusing to load %s: not a regular file", path);
"[SSHD] Refusing to load (not a regular file): %s", path);
ret = WS_BAD_FILE_E;
}
else if (st.st_uid != ownerUid && st.st_uid != 0) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Refusing to load %s: not owned by the user or root",
"[SSHD] Refusing to load (not owned by the user or root): %s",
path);
ret = WS_BAD_FILE_E;
}
else if ((st.st_mode & (S_IWGRP | S_IWOTH)) != 0) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Refusing to load %s: group or world writable", path);
"[SSHD] Refusing to load (group or world writable): %s", path);
ret = WS_BAD_FILE_E;
}
else if (rejectReadable && (st.st_mode & (S_IRGRP | S_IROTH)) != 0) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Refusing to load %s: group or world readable", path);
"[SSHD] Refusing to load (group or world readable): %s", path);
ret = WS_BAD_FILE_E;
}
else if (st.st_dev != lst.st_dev || st.st_ino != lst.st_ino) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Refusing to load %s: file changed during open", path);
"[SSHD] Refusing to load (file changed during open): %s",
path);
ret = WS_BAD_FILE_E;
}
}
Expand Down Expand Up @@ -1294,7 +1295,7 @@ static int SearchKeysFile(const char* keysFilePath, const byte* key,
if (wolfSSHD_OpenSecureFile(keysFilePath, uid,
0 /* rejectReadable */, NULL, &f) != WS_SUCCESS) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Keys file %s failed StrictModes check", keysFilePath);
"[SSHD] Keys file failed StrictModes check: %s", keysFilePath);
ret = WSSHD_AUTH_FAILURE;
}
}
Expand Down
4 changes: 1 addition & 3 deletions apps/wolfsshd/test/run_all_sshd_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,7 @@ run_test() {
# separation is off and a high port is used, so no root is needed.
run_strictmodes_negative_test() {
printf "Host key trust-anchor negative test ... "
# Use a relative host key path: wolfSSH log lines are capped at 120 chars,
# so a long absolute path would truncate the "group or world readable"
# message this test greps for.
# A local copy of the host key, made group/world readable.
cp ../../../keys/server-key.pem strictmodes_hostkey.pem
chmod 644 strictmodes_hostkey.pem
cat <<EOF > sshd_config_test_strictmodes
Expand Down
Loading