Skip to content
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

Sanitize UserName and CompName #1538

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Sanitize UserName and CompName #1538

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3af5693
xrCore: Sanitize `UserName` and `CompName`
AMS21 Nov 20, 2023
ca0c925
Apply suggestions from code review
Xottab-DUTY Apr 5, 2024
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
46 changes: 38 additions & 8 deletions src/xrCore/xrCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,26 @@ const pcstr xrCore::buildDate = __DATE__;
const pcstr xrCore::buildCommit = MACRO_TO_STRING(GIT_INFO_CURRENT_COMMIT);
const pcstr xrCore::buildBranch = MACRO_TO_STRING(GIT_INFO_CURRENT_BRANCH);

void SanitizeString(pcstr str)
{
pstr mut_str = const_cast<pstr>(str);

while (*mut_str != '\0')
{
switch (*mut_str)
{
case '\\':
case '/':
case ',':
case '.':
*mut_str = '_';
[[fallthrough]];
default:
++mut_str;
}
}
}

xrCore::xrCore()
: ApplicationName{}, ApplicationPath{},
WorkingPath{},
Expand Down Expand Up @@ -221,21 +241,31 @@ void xrCore::Initialize(pcstr _ApplicationName, pcstr commandLine, LogCallback c
#elif defined(XR_PLATFORM_LINUX) || defined(XR_PLATFORM_BSD) || defined(XR_PLATFORM_APPLE)
uid_t uid = geteuid();
struct passwd *pw = getpwuid(uid);
if(pw)
if (pw)
{
strcpy(UserName, pw->pw_gecos);
char* pos = strchr(UserName, ','); // pw_gecos return string
if(NULL != pos)
*pos = 0;
if(0 == UserName[0])
strcpy(UserName, pw->pw_name);
strncpy(UserName, pw->pw_gecos, sizeof(UserName) - 1);
if (UserName[0] == '\0')
strncpy(UserName, pw->pw_name, sizeof(UserName) - 1);
}
else
Msg("! Failed to get user name");

gethostname(CompName, sizeof(CompName));
if (gethostname(CompName, sizeof(CompName)) == 0)
CompName[sizeof(CompName) - 1] = '\0';
else
Msg("! Failed to get computer name");
#else
# error Select or add implementation for your platform
#endif

SanitizeString(UserName);
SanitizeString(CompName);

#ifdef DEBUG
Msg("UserName: %s", UserName);
Msg("ComputerName: %s", CompName);
#endif

Memory._initialize();

SDL_LogSetOutputFunction(SDLLogOutput, nullptr);
Expand Down
Loading