kallithea Changeset - 7b809e4a1ea5

Changeset - 7b809e4a1ea5

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2020-11-04 14:30:48
mads@kiilerich.com

Grafted from: 18bef9719f66

git: don't force exact mode on Git hooks when making them executable - use umask

2 files changed with 7 insertions and 2 deletions:

kallithea/lib/utils2.py

kallithea/model/scm.py

0 comments (0 inline, 0 general)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -77,12 +77,17 @@ assert ascii_bytes @@
 assert ascii_str
 assert safe_bytes
 assert safe_str
 assert LazyProperty
 # get current umask value without changing it
 umask = os.umask(0)
 os.umask(umask)
 def convert_line_endings(line, mode):
     """
     Converts a given line  "line end" according to given mode
     Available modes are::
 - Unix

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -38,13 +38,13 @@ from tg.i18n import ugettext as _ @@
 import kallithea
 from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel
 from kallithea.lib.exceptions import IMCCommitError, NonRelativePathError
 from kallithea.lib.hooks import process_pushed_raw_ids
 from kallithea.lib.utils import action_logger, get_filesystem_repos, make_ui
 from kallithea.lib.utils2 import safe_bytes, safe_str, set_hook_environment
+from kallithea.lib.utils2 import safe_bytes, safe_str, set_hook_environment, umask
 from kallithea.lib.vcs import get_repo
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.model import db, meta
@@ @@ -708,13 +708,13 @@ class ScmModel(object): @@
             else:
                 log.debug('writing %s hook file !', h_type)
                 try:
                     fh, fn = tempfile.mkstemp(prefix=hook_file + '.tmp.')
                     os.write(fh, tmpl.replace(b'_TMPL_', safe_bytes(kallithea.__version__)))
                     os.close(fh)
-                    os.chmod(fn, 0o755)
+                    os.chmod(fn, 0o777 & ~umask)
                     os.rename(fn, hook_file)
                 except (OSError, IOError) as e:
                     log.error('error writing hook %s: %s', hook_file, e)
 def AvailableRepoGroupChoices(repo_group_perm_level, extras=()):

0 comments (0 inline, 0 general)