Skip to content

Add strict permissions flag #800

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add strict permissions flag #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
532df6a
Add strict permissions flag
MisterTea Nov 2, 2021
aa82058
Update easylogging++.h
MisterTea Jan 7, 2022
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
7 changes: 7 additions & 0 deletions src/easylogging++.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,13 @@ base::type::fstream_t* File::newFileStream(const std::string& filename) {
#endif // defined(ELPP_UNICODE)
if (fs->is_open()) {
fs->flush();
#if defined(ELPP_STRICT_PERMISSIONS)
if (filename != "/dev/null" && filename != "nul") {
fs::permissions(filename,
fs::perms::owner_read | fs::perms::owner_write | fs::perms::group_read,
fs::perm_options::replace);
}
#endif
} else {
base::utils::safeDelete(fs);
ELPP_INTERNAL_ERROR("Bad file [" << filename << "]", true);
Expand Down
32 changes: 32 additions & 0 deletions src/easylogging++.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,38 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
// For logging wxWidgets based classes & templates
# include <wx/vector.h>
#endif // defined(ELPP_WXWIDGETS_LOGGING)
#if defined(ELPP_STRICT_PERMISSIONS)
// Need to check for Boost first because Mojave *has* std::filesystem,
// but won't let you use it.
#ifdef __APPLE__
#include <Availability.h>
#endif

#if defined(__APPLE__) && __MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
#if __has_include(<boost/filesystem.hpp>)
#include <boost/filesystem.hpp>
namespace fs = boost::filesystem;
#else
#include <filesystem>
namespace fs = std::filesystem;
#endif
#else
// For non-Apple systems, prefer std::filesystem
// Otherwise, older versions of boost cause failures.
#if __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental;
#elif __has_include(<boost/filesystem>)
#include <boost/filesystem>
namespace fs = boost::filesystem
#else
#pragma message "No filesystem library found."
#endif
#endif
#endif
#if defined(ELPP_UTC_DATETIME)
# define elpptime_r gmtime_r
# define elpptime_s gmtime_s
Expand Down