From: Junio C Hamano <gitster@pobox.com> To: "René Scharfe" <l.s.r@web.de> Cc: rsbecker@nexbridge.com, 'Johannes Schindelin via GitGitGadget' <gitgitgadget@gmail.com>, git@vger.kernel.org, 'Taylor Blau' <me@ttaylorr.com>, 'Derrick Stolee' <stolee@gmail.com>, 'Elijah Newren' <newren@gmail.com>, 'Johannes Schindelin' <johannes.schindelin@gmx.de> Subject: Re: [PATCH v4 1/7] archive: optionally add "virtual" files Date: Thu, 12 May 2022 11:15:05 -0700 [thread overview] Message-ID: <xmqqfslefwie.fsf@gitster.g> (raw) In-Reply-To: <47ed5a2f-f4aa-1ec1-27c9-9b0b70eb8bca@web.de> (=?utf-8?Q?=22R?= =?utf-8?Q?en=C3=A9?= Scharfe"'s message of "Thu, 12 May 2022 18:16:50 +0200") René Scharfe <l.s.r@web.de> writes: > Good point. write_tar_entry() actually normalizes the permission bits > and applies tar.umask (0002 by default): > > if (S_ISDIR(mode) || S_ISGITLINK(mode)) { > *header.typeflag = TYPEFLAG_DIR; > mode = (mode | 0777) & ~tar_umask; > } else if (S_ISLNK(mode)) { > *header.typeflag = TYPEFLAG_LNK; > mode |= 0777; > } else if (S_ISREG(mode)) { > *header.typeflag = TYPEFLAG_REG; > mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask; Yeah, this side seems to care only about u+x bit, so "add-executable" as a separate option would fly we.. > But write_zip_entry() only normalizes (drops) the permission bits of > non-executable files: > > attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) : > (mode & 0111) ? ((mode) << 16) : 0; > if (S_ISLNK(mode) || (mode & 0111)) > creator_version = 0x0317; > > attr2 corresponds to the field "external file attributes" mentioned in > the ZIP format specification, APPNOTE.TXT. It's interpreted based on > the "version made by" (creator_version here); that 0x03 part above > means "UNIX". The default is MS-DOS (FAT filesystem), with effectivly > no support for file permissions. > > So we currently leak permission bits of executable files into ZIP > archives, but not tar files. :-| Normalizing those to 0755 would be > more consistent. Yup. >> For tracked paths, we probably are normalizing the blobs >> between 0644 and 0755 way before the values are passed as "mode" >> parameter to the write_entry() functions, but for these extra files, >> there is no such massaging. > > Right, mode values from read_tree() pass through canon_mode(), so only > untracked files (those appended with --add-file) are affected by the > leakage mentioned above. Thanks for sanity-checking.
next prev parent reply other threads:[~2022-05-12 18:15 UTC|newest] Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-26 8:41 [PATCH 0/5] scalar: implement the subcommand "diagnose" Johannes Schindelin via GitGitGadget 2022-01-26 8:41 ` [PATCH 1/5] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget 2022-01-26 9:34 ` René Scharfe 2022-01-26 22:20 ` Taylor Blau 2022-02-06 21:34 ` Johannes Schindelin 2022-01-27 19:38 ` Elijah Newren 2022-01-26 8:41 ` [PATCH 2/5] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget 2022-01-26 8:41 ` [PATCH 3/5] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget 2022-01-26 22:43 ` Taylor Blau 2022-01-27 15:14 ` Derrick Stolee 2022-02-06 21:38 ` Johannes Schindelin 2022-01-26 8:41 ` [PATCH 4/5] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget 2022-01-26 22:50 ` Taylor Blau 2022-01-27 15:17 ` Derrick Stolee 2022-01-27 18:59 ` Elijah Newren 2022-02-06 21:25 ` Johannes Schindelin 2022-01-26 8:41 ` [PATCH 5/5] scalar diagnose: show a spinner while staging content Johannes Schindelin via GitGitGadget 2022-01-27 15:19 ` [PATCH 0/5] scalar: implement the subcommand "diagnose" Derrick Stolee 2022-02-06 21:13 ` Johannes Schindelin 2022-02-06 22:39 ` [PATCH v2 0/6] " Johannes Schindelin via GitGitGadget 2022-02-06 22:39 ` [PATCH v2 1/6] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget 2022-02-07 19:55 ` René Scharfe 2022-02-07 23:30 ` Junio C Hamano 2022-02-08 13:12 ` Johannes Schindelin 2022-02-08 17:44 ` Junio C Hamano 2022-02-08 20:58 ` René Scharfe 2022-02-09 22:48 ` Junio C Hamano 2022-02-10 19:10 ` René Scharfe 2022-02-10 19:23 ` Junio C Hamano 2022-02-11 19:16 ` René Scharfe 2022-02-11 21:27 ` Junio C Hamano 2022-02-12 9:12 ` René Scharfe 2022-02-13 6:25 ` Junio C Hamano 2022-02-13 9:02 ` René Scharfe 2022-02-14 17:22 ` Junio C Hamano 2022-02-08 12:54 ` Johannes Schindelin 2022-02-06 22:39 ` [PATCH v2 2/6] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget 2022-02-06 22:39 ` [PATCH v2 3/6] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget 2022-02-07 19:55 ` René Scharfe 2022-02-08 12:08 ` Johannes Schindelin 2022-02-06 22:39 ` [PATCH v2 4/6] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget 2022-02-06 22:39 ` [PATCH v2 5/6] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget 2022-02-06 22:39 ` [PATCH v2 6/6] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget 2022-05-04 15:25 ` [PATCH v3 0/7] scalar: implement the subcommand "diagnose" Johannes Schindelin via GitGitGadget 2022-05-04 15:25 ` [PATCH v3 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget 2022-05-04 15:25 ` [PATCH v3 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget 2022-05-07 2:06 ` Elijah Newren 2022-05-09 21:04 ` Johannes Schindelin 2022-05-04 15:25 ` [PATCH v3 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget 2022-05-04 15:25 ` [PATCH v3 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget 2022-05-04 15:25 ` [PATCH v3 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget 2022-05-04 15:25 ` [PATCH v3 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget 2022-05-04 15:25 ` [PATCH v3 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget 2022-05-07 2:23 ` [PATCH v3 0/7] scalar: implement the subcommand "diagnose" Elijah Newren 2022-05-10 19:26 ` [PATCH v4 " Johannes Schindelin via GitGitGadget 2022-05-10 19:26 ` [PATCH v4 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget 2022-05-10 21:48 ` Junio C Hamano 2022-05-10 22:06 ` rsbecker 2022-05-10 23:21 ` Junio C Hamano 2022-05-11 16:14 ` René Scharfe 2022-05-11 19:27 ` Junio C Hamano 2022-05-12 16:16 ` René Scharfe 2022-05-12 18:15 ` Junio C Hamano [this message] 2022-05-12 21:31 ` Junio C Hamano 2022-05-14 7:06 ` René Scharfe 2022-05-12 22:31 ` [PATCH] fixup! " Junio C Hamano 2022-05-10 19:26 ` [PATCH v4 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget 2022-05-10 21:56 ` Junio C Hamano 2022-05-10 22:23 ` rsbecker 2022-05-19 18:12 ` Johannes Schindelin 2022-05-19 18:09 ` Johannes Schindelin 2022-05-19 18:44 ` Junio C Hamano 2022-05-10 19:27 ` [PATCH v4 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget 2022-05-17 14:51 ` Ævar Arnfjörð Bjarmason 2022-05-18 17:35 ` Junio C Hamano 2022-05-20 7:30 ` Ævar Arnfjörð Bjarmason 2022-05-20 15:55 ` Johannes Schindelin 2022-05-21 9:54 ` Ævar Arnfjörð Bjarmason 2022-05-22 5:50 ` Junio C Hamano 2022-05-24 12:25 ` Johannes Schindelin 2022-05-24 18:11 ` Ævar Arnfjörð Bjarmason 2022-05-24 19:29 ` Junio C Hamano 2022-05-25 10:31 ` Johannes Schindelin 2022-05-10 19:27 ` [PATCH v4 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget 2022-05-17 14:53 ` Ævar Arnfjörð Bjarmason 2022-05-10 19:27 ` [PATCH v4 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget 2022-05-10 19:27 ` [PATCH v4 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget 2022-05-10 19:27 ` [PATCH v4 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget 2022-05-17 15:03 ` [PATCH v4 0/7] scalar: implement the subcommand "diagnose" Ævar Arnfjörð Bjarmason 2022-05-17 15:28 ` rsbecker 2022-05-19 18:17 ` Johannes Schindelin 2022-05-19 18:17 ` [PATCH v5 " Johannes Schindelin via GitGitGadget 2022-05-19 18:17 ` [PATCH v5 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget 2022-05-20 14:41 ` René Scharfe 2022-05-20 16:21 ` Junio C Hamano 2022-05-19 18:17 ` [PATCH v5 2/7] archive --add-file-with-contents: allow paths containing colons Johannes Schindelin via GitGitGadget 2022-05-19 18:17 ` [PATCH v5 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget 2022-05-19 18:18 ` [PATCH v5 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget 2022-05-19 18:18 ` [PATCH v5 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget 2022-05-19 18:18 ` [PATCH v5 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget 2022-05-19 18:18 ` [PATCH v5 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget 2022-05-19 19:23 ` [PATCH v5 0/7] scalar: implement the subcommand "diagnose" Junio C Hamano 2022-05-21 15:08 ` [PATCH v6 " Johannes Schindelin via GitGitGadget 2022-05-21 15:08 ` [PATCH v6 1/7] archive: optionally add "virtual" files Johannes Schindelin via GitGitGadget 2022-05-25 21:11 ` Junio C Hamano 2022-05-26 9:09 ` René Scharfe 2022-05-26 17:10 ` Junio C Hamano 2022-05-26 18:57 ` René Scharfe 2022-05-26 20:16 ` Junio C Hamano 2022-05-27 17:02 ` René Scharfe 2022-05-27 19:01 ` Junio C Hamano 2022-05-28 6:57 ` René Scharfe 2022-05-21 15:08 ` [PATCH v6 2/7] archive --add-virtual-file: allow paths containing colons Johannes Schindelin via GitGitGadget 2022-05-25 20:22 ` Junio C Hamano 2022-05-25 21:42 ` Junio C Hamano 2022-05-25 22:34 ` Junio C Hamano 2022-05-21 15:08 ` [PATCH v6 3/7] scalar: validate the optional enlistment argument Johannes Schindelin via GitGitGadget 2022-05-21 15:08 ` [PATCH v6 4/7] Implement `scalar diagnose` Johannes Schindelin via GitGitGadget 2022-05-21 15:08 ` [PATCH v6 5/7] scalar diagnose: include disk space information Johannes Schindelin via GitGitGadget 2022-05-21 15:08 ` [PATCH v6 6/7] scalar: teach `diagnose` to gather packfile info Matthew John Cheetham via GitGitGadget 2022-05-21 15:08 ` [PATCH v6 7/7] scalar: teach `diagnose` to gather loose objects information Matthew John Cheetham via GitGitGadget 2022-05-28 23:11 ` [PATCH v6+ 0/7] js/scalar-diagnose rebased Junio C Hamano 2022-05-28 23:11 ` [PATCH v6+ 1/7] archive: optionally add "virtual" files Junio C Hamano 2022-05-28 23:11 ` [PATCH v6+ 2/7] archive --add-virtual-file: allow paths containing colons Junio C Hamano 2022-06-15 18:16 ` Adam Dinwoodie 2022-06-15 20:00 ` Junio C Hamano 2022-06-15 21:36 ` Adam Dinwoodie 2022-06-18 20:19 ` Johannes Schindelin 2022-06-18 22:05 ` Junio C Hamano 2022-06-20 9:41 ` Adam Dinwoodie 2022-05-28 23:11 ` [PATCH v6+ 3/7] scalar: validate the optional enlistment argument Junio C Hamano 2022-05-28 23:11 ` [PATCH v6+ 4/7] scalar: implement `scalar diagnose` Junio C Hamano 2022-06-10 2:08 ` Ævar Arnfjörð Bjarmason 2022-06-10 16:44 ` Junio C Hamano 2022-06-10 17:35 ` Ævar Arnfjörð Bjarmason 2022-05-28 23:11 ` [PATCH v6+ 5/7] scalar diagnose: include disk space information Junio C Hamano 2022-05-28 23:11 ` [PATCH v6+ 6/7] scalar: teach `diagnose` to gather packfile info Junio C Hamano 2022-05-28 23:11 ` [PATCH v6+ 7/7] scalar: teach `diagnose` to gather loose objects information Junio C Hamano 2022-05-30 10:12 ` [PATCH v6+ 0/7] js/scalar-diagnose rebased Johannes Schindelin 2022-05-30 17:37 ` Junio C Hamano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=xmqqfslefwie.fsf@gitster.g \ --to=gitster@pobox.com \ --cc=git@vger.kernel.org \ --cc=gitgitgadget@gmail.com \ --cc=johannes.schindelin@gmx.de \ --cc=l.s.r@web.de \ --cc=me@ttaylorr.com \ --cc=newren@gmail.com \ --cc=rsbecker@nexbridge.com \ --cc=stolee@gmail.com \ --subject='Re: [PATCH v4 1/7] archive: optionally add "virtual" files' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).