From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Erik Werner Subject: [PATCH 2/2] setup: Don't dereference in-tree symlinks for absolute paths Date: Sun, 26 Jan 2014 15:22:26 +0100 Message-ID: <1390746146-9478-3-git-send-email-martinerikwerner@gmail.com> References: <20140115124859.GA4283@mule> <1390746146-9478-1-git-send-email-martinerikwerner@gmail.com> Cc: richih@debian.org, Martin Erik Werner To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jan 26 15:23:27 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W7QcP-0001sr-AP for gcvg-git-2@plane.gmane.org; Sun, 26 Jan 2014 15:23:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752167AbaAZOW7 (ORCPT ); Sun, 26 Jan 2014 09:22:59 -0500 Received: from mail-la0-f50.google.com ([209.85.215.50]:34419 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbaAZOWx (ORCPT ); Sun, 26 Jan 2014 09:22:53 -0500 Received: by mail-la0-f50.google.com with SMTP id ec20so3770443lab.37 for ; Sun, 26 Jan 2014 06:22:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BHf3KUBJOqLi0YyhU9pqciC83QldLn2Su44yFsrru94=; b=klgWenCcQjvTGHzyYwjpZ9EFtmvNXOrHn7PFzCh2U6sU/O2axIkJXR6lJbilNYtcdf nGesxnLGsJVa9pMUd6cp18PvdXF7GuZYE1whLXfBNNzgbGiixMqOhxzWsyBlwnS3Z/m9 qAyOTGCDUVBVqYxi6p82WMvdm8MOfSHQVPlRA0KZNJe0hedTTddJFK8qc7FndZltO/Hs hOc1QacjLmjWV3qN6EudOREzQvtPu0GU6PKrVYu/cCqZiKu7G7mdmY/eyYY52RS0dXKK KSwWrcVBg2g7fPFDZWcF2Xz4tIBwzkVBOYuBiWuqHOXmLVnqDVmaxYYfloP7JjEA9KS3 IZcQ== X-Received: by 10.152.2.5 with SMTP id 5mr14785363laq.21.1390746172254; Sun, 26 Jan 2014 06:22:52 -0800 (PST) Received: from mule.student.uu.se (nl116-226-21.student.uu.se. [130.243.226.21]) by mx.google.com with ESMTPSA id g8sm12109991lae.1.2014.01.26.06.22.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jan 2014 06:22:51 -0800 (PST) X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390746146-9478-1-git-send-email-martinerikwerner@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The prefix_path_gently() function currently applies real_path to everything if given an absolute path, dereferencing symlinks both outside and inside the work tree. In order to manipulate symliks in the work tree using absolute paths, symlinks should only be dereferenced outside the work tree. Modify prefix_path_gently() to first normalize the path in order to make sure path levels are separated by '/', then use this separator to check the real path of each level of the path until it has found the length that corresponds to the work tree. For absolute paths, the function did not, nor does now do, any actual prefixing, hence we simply remove the path corresponding to the work tree and return the remaining in-tree part of the path. Fixes t0060-82. Signed-off-by: Martin Erik Werner --- setup.c | 54 ++++++++++++++++++++++++++++++++------------------- t/t0060-path-utils.sh | 2 +- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/setup.c b/setup.c index 6c3f85f..bec587e 100644 --- a/setup.c +++ b/setup.c @@ -22,11 +22,41 @@ char *prefix_path_gently(const char *prefix, int len, const char *orig = path; char *sanitized; if (is_absolute_path(orig)) { - const char *temp = real_path(path); - sanitized = xmalloc(len + strlen(temp) + 1); - strcpy(sanitized, temp); + char npath[strlen(path)]; if (remaining_prefix) *remaining_prefix = 0; + if (normalize_path_copy_len(npath, path, remaining_prefix)) + return NULL; + const char *work_tree = get_git_work_tree(); + if (!work_tree) + return NULL; + struct string_list list = STRING_LIST_INIT_DUP; + string_list_split(&list, npath, '/', -1); + + char wtpart[strlen(npath) + 1]; + int i = 0; + int match = 0; + strcpy(wtpart, list.items[i++].string); + strcpy(wtpart, "/"); + if (strcmp(real_path(wtpart), work_tree) == 0) { + match = 1; + } else { + while (i < list.nr) { + strcat(wtpart, list.items[i++].string); + if (strcmp(real_path(wtpart), work_tree) == 0) { + match = 1; + break; + } + strcat(wtpart, "/"); + } + } + string_list_clear(&list, 0); + if (!match) + return NULL; + + size_t wtpartlen = strlen(wtpart); + sanitized = xmalloc(strlen(npath) - wtpartlen); + strcpy(sanitized, npath + wtpartlen + 1); } else { sanitized = xmalloc(len + strlen(path) + 1); if (len) @@ -34,26 +64,10 @@ char *prefix_path_gently(const char *prefix, int len, strcpy(sanitized + len, path); if (remaining_prefix) *remaining_prefix = len; - } - if (normalize_path_copy_len(sanitized, sanitized, remaining_prefix)) - goto error_out; - if (is_absolute_path(orig)) { - size_t root_len, len, total; - const char *work_tree = get_git_work_tree(); - if (!work_tree) - goto error_out; - len = strlen(work_tree); - root_len = offset_1st_component(work_tree); - total = strlen(sanitized) + 1; - if (strncmp(sanitized, work_tree, len) || - (len > root_len && sanitized[len] != '\0' && sanitized[len] != '/')) { - error_out: + if (normalize_path_copy_len(sanitized, sanitized, remaining_prefix)) { free(sanitized); return NULL; } - if (sanitized[len] == '/') - len++; - memmove(sanitized, sanitized + len, total - len); } return sanitized; } diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index 3a0677a..03a12ac 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -190,7 +190,7 @@ test_expect_success SYMLINKS 'real path works on symlinks' ' test "$sym" = "$(test-path-utils real_path "$dir2/syml")" ' -test_expect_failure SYMLINKS 'prefix_path works with work tree symlinks' ' +test_expect_success SYMLINKS 'prefix_path works with work tree symlinks' ' ln -s target symlink && test "$(test-path-utils prefix_path prefix "$(pwd)/symlink")" = "symlink" -- 1.8.5.2