KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent invalid root paths

Browse Source
This commit is contained in:
Kovid Goyal 2022-02-27 18:39:09 +05:30
parent ae48407b20
commit c0d5ace640
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kittens/ssh/options/definition.py
View File

@ -26,9 +26,10 @@ against is the hostname used by the remote computer, not the name you pass
to SSH to connect to it. to SSH to connect to it.
''') ''')
opt('remote_dir', '.local/share/kitty-ssh-kitten', long_text=''' opt('remote_dir', '.local/share/kitty-ssh-kitten', option_type='relative_dir', long_text='''
The location on the remote computer where the files needed for this kitten The location on the remote computer where the files needed for this kitten
are installed. The location is relative to the HOME directory for relative paths. are installed. The location is relative to the HOME directory. Absolute paths or paths
that resolve to a location outside the HOME are not allowed.
''') ''')
opt('shell_integration', 'inherit', long_text=''' opt('shell_integration', 'inherit', long_text='''

11
kittens/ssh/options/utils.py
View File

@ -2,11 +2,22 @@
# License: GPLv3 Copyright: 2022, Kovid Goyal <kovid at kovidgoyal.net> # License: GPLv3 Copyright: 2022, Kovid Goyal <kovid at kovidgoyal.net>
from typing import Any, Dict, Optional, Iterable, Tuple from typing import Any, Dict, Optional, Iterable, Tuple
import posixpath
DELETE_ENV_VAR = '_delete_this_env_var_' DELETE_ENV_VAR = '_delete_this_env_var_'
def relative_dir(val: str) -> str:
if posixpath.isabs(val):
raise ValueError(f'Absolute paths not allowed. {val} is invalid.')
base = '/ffjdg'
q = posixpath.normpath(posixpath.join(base, val))
if q == base or not q.startswith(base):
raise ValueError(f'Paths that escape their parent dir are not allowed. {val} is not valid')
return posixpath.normpath(val)
def env(val: str, current_val: Dict[str, str]) -> Iterable[Tuple[str, str]]: def env(val: str, current_val: Dict[str, str]) -> Iterable[Tuple[str, str]]:
val = val.strip() val = val.strip()
if val: if val: