git: update to v2.25.1

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index ab44659a93bb1b66d98ff2bf110de2838e0c39a5..30e2d4bf5f5484e1a5cd3541e8531f110a1e91f0 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,43 +1,181 @@
 /* ui-blob.c: show blob content
  *
 /* ui-blob.c: show blob content
  *

- * Copyright (C) 2008 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "ui-blob.h"

 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 

-void cgit_print_blob(const char *hex, char *path)
+struct walk_tree_context {
+       const char *match_path;
+       struct object_id *matched_oid;
+       unsigned int found_path:1;
+       unsigned int file_only:1;
+};
+
+static int walk_tree(const struct object_id *oid, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)
+{
+       struct walk_tree_context *walk_tree_ctx = cbdata;
+
+       if (walk_tree_ctx->file_only && !S_ISREG(mode))
+               return READ_TREE_RECURSIVE;
+       if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
+               || strcmp(walk_tree_ctx->match_path + base->len, pathname))
+               return READ_TREE_RECURSIVE;
+       oidcpy(walk_tree_ctx->matched_oid, oid);
+       walk_tree_ctx->found_path = 1;
+       return 0;
+}
+
+int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
+{
+       struct object_id oid;
+       unsigned long size;
+       struct pathspec_item path_items = {
+               .match = xstrdup(path),
+               .len = strlen(path)
+       };
+       struct pathspec paths = {
+               .nr = 1,
+               .items = &path_items
+       };
+       struct walk_tree_context walk_tree_ctx = {
+               .match_path = path,
+               .matched_oid = &oid,
+               .found_path = 0,
+               .file_only = file_only
+       };
+
+       if (get_oid(ref, &oid))
+               goto done;
+       if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
+               goto done;
+       read_tree_recursive(the_repository, lookup_commit_reference(the_repository, &oid)->maybe_tree,
+               "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+
+done:
+       free(path_items.match);
+       return walk_tree_ctx.found_path;
+}
+
+int cgit_print_file(char *path, const char *head, int file_only)

 {
 {

+       struct object_id oid;
+       enum object_type type;
+       char *buf;
+       unsigned long size;
+       struct commit *commit;
+       struct pathspec_item path_items = {
+               .match = path,
+               .len = strlen(path)
+       };
+       struct pathspec paths = {
+               .nr = 1,
+               .items = &path_items
+       };
+       struct walk_tree_context walk_tree_ctx = {
+               .match_path = path,
+               .matched_oid = &oid,
+               .found_path = 0,
+               .file_only = file_only
+       };
+
+       if (get_oid(head, &oid))
+               return -1;
+       type = oid_object_info(the_repository, &oid, &size);
+       if (type == OBJ_COMMIT) {
+               commit = lookup_commit_reference(the_repository, &oid);
+               read_tree_recursive(the_repository, commit->maybe_tree,
+                       "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+               if (!walk_tree_ctx.found_path)
+                       return -1;
+               type = oid_object_info(the_repository, &oid, &size);
+       }
+       if (type == OBJ_BAD)
+               return -1;
+       buf = read_object_file(&oid, &type, &size);
+       if (!buf)
+               return -1;
+       buf[size] = '\0';
+       html_raw(buf, size);
+       free(buf);
+       return 0;
+}

 
 

-       unsigned char sha1[20];
+void cgit_print_blob(const char *hex, char *path, const char *head, int file_only)
+{
+       struct object_id oid;

        enum object_type type;
        enum object_type type;

-       unsigned char *buf;
+       char *buf;

        unsigned long size;
        unsigned long size;

+       struct commit *commit;
+       struct pathspec_item path_items = {
+               .match = path,
+               .len = path ? strlen(path) : 0
+       };
+       struct pathspec paths = {
+               .nr = 1,
+               .items = &path_items
+       };
+       struct walk_tree_context walk_tree_ctx = {
+               .match_path = path,
+               .matched_oid = &oid,
+               .found_path = 0,
+               .file_only = file_only
+       };

 
 

-       if (get_sha1_hex(hex, sha1)){
-               cgit_print_error(fmt("Bad hex value: %s", hex));
-               return;
+       if (hex) {
+               if (get_oid_hex(hex, &oid)) {
+                       cgit_print_error_page(400, "Bad request",
+                                       "Bad hex value: %s", hex);
+                       return;
+               }
+       } else {
+               if (get_oid(head, &oid)) {
+                       cgit_print_error_page(404, "Not found",
+                                       "Bad ref: %s", head);
+                       return;
+               }
+       }
+
+       type = oid_object_info(the_repository, &oid, &size);
+
+       if ((!hex) && type == OBJ_COMMIT && path) {
+               commit = lookup_commit_reference(the_repository, &oid);
+               read_tree_recursive(the_repository, commit->maybe_tree,
+                       "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+               type = oid_object_info(the_repository, &oid, &size);

        }
 
        }
 

-       type = sha1_object_info(sha1, &size);

        if (type == OBJ_BAD) {
        if (type == OBJ_BAD) {

-               cgit_print_error(fmt("Bad object name: %s", hex));
+               cgit_print_error_page(404, "Not found",
+                               "Bad object name: %s", hex);

                return;
        }
 
                return;
        }
 

-       buf = read_sha1_file(sha1, &type, &size);
+       buf = read_object_file(&oid, &type, &size);

        if (!buf) {
        if (!buf) {

-               cgit_print_error(fmt("Error reading object %s", hex));
+               cgit_print_error_page(500, "Internal server error",
+                               "Error reading object %s", hex);

                return;
        }
 
        buf[size] = '\0';
                return;
        }
 
        buf[size] = '\0';

-       ctx.page.mimetype = NULL;
+       if (buffer_is_binary(buf, size))
+               ctx.page.mimetype = "application/octet-stream";
+       else
+               ctx.page.mimetype = "text/plain";

        ctx.page.filename = path;
        ctx.page.filename = path;

-       cgit_print_http_headers(&ctx);
-       write(htmlfd, buf, size);
+
+       html("X-Content-Type-Options: nosniff\n");
+       html("Content-Security-Policy: default-src 'none'\n");
+       cgit_print_http_headers();
+       html_raw(buf, size);
+       free(buf);

 }
 }