Skip to content

Commit

Permalink
Merge pull request #1868 from pre-commit/fix_archive_permissions
Browse files Browse the repository at this point in the history
fix archive permissions for ruby tar.gz roots
  • Loading branch information
asottile committed Apr 6, 2021
2 parents bd1658b + d5eda97 commit baadc2d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
Binary file modified pre_commit/resources/rbenv.tar.gz
Binary file not shown.
Binary file modified pre_commit/resources/ruby-build.tar.gz
Binary file not shown.
Binary file modified pre_commit/resources/ruby-download.tar.gz
Binary file not shown.
11 changes: 7 additions & 4 deletions testing/make-archives
Expand Up @@ -35,17 +35,20 @@ def make_archive(name: str, repo: str, ref: str, destdir: str) -> str:
"""
output_path = os.path.join(destdir, f'{name}.tar.gz')
with tempfile.TemporaryDirectory() as tmpdir:
# this ensures that the root directory has umask permissions
gitdir = os.path.join(tmpdir, 'root')

# Clone the repository to the temporary directory
subprocess.check_call(('git', 'clone', repo, tmpdir))
subprocess.check_call(('git', '-C', tmpdir, 'checkout', ref))
subprocess.check_call(('git', 'clone', repo, gitdir))
subprocess.check_call(('git', '-C', gitdir, 'checkout', ref))

# We don't want the '.git' directory
# It adds a bunch of size to the archive and we don't use it at
# runtime
shutil.rmtree(os.path.join(tmpdir, '.git'))
shutil.rmtree(os.path.join(gitdir, '.git'))

with tarfile.open(output_path, 'w|gz') as tf:
tf.add(tmpdir, name)
tf.add(gitdir, name)

return output_path

Expand Down
13 changes: 13 additions & 0 deletions tests/languages/ruby_test.py
@@ -1,4 +1,5 @@
import os.path
import tarfile
from unittest import mock

import pytest
Expand All @@ -8,6 +9,7 @@
from pre_commit.languages import ruby
from pre_commit.prefix import Prefix
from pre_commit.util import cmd_output
from pre_commit.util import resource_bytesio
from testing.util import xfailif_windows


Expand Down Expand Up @@ -72,3 +74,14 @@ def test_install_ruby_with_version(fake_gem_prefix):
# Should be able to activate and use rbenv install
with ruby.in_env(fake_gem_prefix, '2.7.2'):
cmd_output('rbenv', 'install', '--help')


@pytest.mark.parametrize(
'filename',
('rbenv.tar.gz', 'ruby-build.tar.gz', 'ruby-download.tar.gz'),
)
def test_archive_root_stat(filename):
with resource_bytesio(filename) as f:
with tarfile.open(fileobj=f) as tarf:
root, _, _ = filename.partition('.')
assert oct(tarf.getmember(root).mode) == '0o755'

0 comments on commit baadc2d

Please sign in to comment.