Skip to content

Chown the history file #4656

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
gpotter2 merged 2 commits into from
Feb 5, 2025
Merged

Chown the history file #4656

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28a5bd2
Chown the history file
gpotter2 Feb 5, 2025
97055e6
Fix
gpotter2 Feb 5, 2025
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
60 changes: 32 additions & 28 deletions scapy/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,26 @@ def _probe_cache_folder(*cf):
)


def _check_perms(file: Union[pathlib.Path, str]) -> None:
"""
Checks that the permissions of a file are properly user-specific, if sudo is used.
"""
if (
not WINDOWS and
"SUDO_UID" in os.environ and
"SUDO_GID" in os.environ
):
# Was started with sudo. Still, chown to the user.
try:
os.chown(
file,
int(os.environ["SUDO_UID"]),
int(os.environ["SUDO_GID"]),
)
except Exception:
pass


def _read_config_file(cf, _globals=globals(), _locals=locals(),
interactive=True, default=None):
# type: (str, Dict[str, Any], Dict[str, Any], bool, Optional[str]) -> None
Expand Down Expand Up @@ -137,36 +157,12 @@ def _read_config_file(cf, _globals=globals(), _locals=locals(),
try:
if not cf_path.parent.exists():
cf_path.parent.mkdir(parents=True, exist_ok=True)
if (
not WINDOWS and
"SUDO_UID" in os.environ and
"SUDO_GID" in os.environ
):
# Was started with sudo. Still, chown to the user.
try:
os.chown(
cf_path.parent,
int(os.environ["SUDO_UID"]),
int(os.environ["SUDO_GID"]),
)
except Exception:
pass
_check_perms(cf_path.parent)

with cf_path.open("w") as fd:
fd.write(default)
if (
not WINDOWS and
"SUDO_UID" in os.environ and
"SUDO_GID" in os.environ
):
# Was started with sudo. Still, chown to the user.
try:
os.chown(
cf_path,
int(os.environ["SUDO_UID"]),
int(os.environ["SUDO_GID"]),
)
except Exception:
pass

_check_perms(cf_path)
log_loading.debug("Config file [%s] created with default.", cf)
except OSError:
log_loading.warning("Config file [%s] could not be created.", cf,
Expand Down Expand Up @@ -816,6 +812,14 @@ def interact(mydict=None, argv=None, mybanner=None, loglevel=logging.INFO):
banner_text += "\n"
banner_text += mybanner

# Make sure the history file has proper permissions
try:
if not pathlib.Path(conf.histfile).exists():
pathlib.Path(conf.histfile).touch()
_check_perms(conf.histfile)
except OSError:
pass

# Configure interactive terminal

if conf.interactive_shell not in [
Expand Down
Loading