forks/archivebox
1
0
Fork 0
Code Releases Activity

Merge pull request #385 from apkallum/origin/output-permissions

Browse source
This commit is contained in:
Nick Sweeting 2020-07-23 11:52:31 -04:00 committed by GitHub
commit 02a2fefbba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archivebox/config/__init__.py
View file

@ -864,3 +864,5 @@ def setup_django(out_dir: str=None, check_db=False, config: ConfigDict=CONFIG) -
f'No database file {SQL_INDEX_FILENAME} found in OUTPUT_DIR: {config["OUTPUT_DIR"]}') f'No database file {SQL_INDEX_FILENAME} found in OUTPUT_DIR: {config["OUTPUT_DIR"]}')
except KeyboardInterrupt: except KeyboardInterrupt:
raise SystemExit(2) raise SystemExit(2)
os.umask(0o777 - int(OUTPUT_PERMISSIONS, base=8))

3
archivebox/index/__init__.py
View file

@ -26,6 +26,7 @@ from ..config import (
URL_BLACKLIST_PTN, URL_BLACKLIST_PTN,
ANSI, ANSI,
stderr, stderr,
OUTPUT_PERMISSIONS
) )
from ..logging_util import ( from ..logging_util import (
TimedProgress, TimedProgress,
@ -232,6 +233,8 @@ def write_main_index(links: List[Link], out_dir: str=OUTPUT_DIR, finished: bool=
with timed_index_update(os.path.join(out_dir, SQL_INDEX_FILENAME)): with timed_index_update(os.path.join(out_dir, SQL_INDEX_FILENAME)):
write_sql_main_index(links, out_dir=out_dir) write_sql_main_index(links, out_dir=out_dir)
os.chmod(os.path.join(out_dir, SQL_INDEX_FILENAME), int(OUTPUT_PERMISSIONS, base=8)) # set here because we don't write it with atomic writes
with timed_index_update(os.path.join(out_dir, JSON_INDEX_FILENAME)): with timed_index_update(os.path.join(out_dir, JSON_INDEX_FILENAME)):
write_json_main_index(links, out_dir=out_dir) write_json_main_index(links, out_dir=out_dir)

1
archivebox/main.py
View file

@ -241,7 +241,6 @@ def run(subcommand: str,
def init(force: bool=False, out_dir: str=OUTPUT_DIR) -> None: def init(force: bool=False, out_dir: str=OUTPUT_DIR) -> None:
"""Initialize a new ArchiveBox collection in the current directory""" """Initialize a new ArchiveBox collection in the current directory"""
os.makedirs(out_dir, exist_ok=True) os.makedirs(out_dir, exist_ok=True)
is_empty = not len(set(os.listdir(out_dir)) - ALLOWED_IN_OUTPUT_DIR) is_empty = not len(set(os.listdir(out_dir)) - ALLOWED_IN_OUTPUT_DIR)
existing_index = os.path.exists(os.path.join(out_dir, JSON_INDEX_FILENAME)) existing_index = os.path.exists(os.path.join(out_dir, JSON_INDEX_FILENAME))

2
archivebox/system.py
View file

@ -43,7 +43,7 @@ def atomic_write(path: Union[Path, str], contents: Union[dict, str, bytes], over
dump(contents, f, indent=4, sort_keys=True, cls=ExtendedEncoder) dump(contents, f, indent=4, sort_keys=True, cls=ExtendedEncoder)
elif isinstance(contents, (bytes, str)): elif isinstance(contents, (bytes, str)):
f.write(contents) f.write(contents)
os.chmod(path, int(OUTPUT_PERMISSIONS, base=8))
@enforce_types @enforce_types
def chmod_file(path: str, cwd: str='.', permissions: str=OUTPUT_PERMISSIONS) -> None: def chmod_file(path: str, cwd: str='.', permissions: str=OUTPUT_PERMISSIONS) -> None:

8
tests/test_init.py
View file

@ -6,6 +6,8 @@ import subprocess
from pathlib import Path from pathlib import Path
import json import json
from archivebox.config import OUTPUT_PERMISSIONS
from .fixtures import * from .fixtures import *
def test_init(tmp_path, process): def test_init(tmp_path, process):
@ -43,3 +45,9 @@ def test_add_link_support_stdin(tmp_path, process):
output_json = json.load(f) output_json = json.load(f)
assert "Example Domain" == output_json['history']['title'][0]['output'] assert "Example Domain" == output_json['history']['title'][0]['output']
def test_correct_permissions_output_folder(tmp_path, process):
index_files = ['index.json', 'index.html', 'index.sqlite3', 'archive']
for file in index_files:
file_path = tmp_path / file
assert oct(file_path.stat().st_mode)[-3:] == OUTPUT_PERMISSIONS