Lukas Fleischer [Mon, 4 Mar 2013 07:52:33 +0000 (08:52 +0100)]
Mark several functions/variables static
Spotted by parsing the output of `gcc -Wmissing-prototypes [...]`.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
John Keeping [Mon, 4 Mar 2013 21:58:51 +0000 (21:58 +0000)]
t0107-snapshot: add tests for ZIP archives
Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping [Mon, 4 Mar 2013 21:58:50 +0000 (21:58 +0000)]
tests: make whitespace consistent
Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping [Mon, 4 Mar 2013 21:58:49 +0000 (21:58 +0000)]
tests: "grep -e" is not portable to all platforms
The "-e" option to grep is not needed unless specifying more than one
pattern, which we don't do. Remove it to avoid restricting the tests on
platforms that do not have a grep that recognises "-e".
Signed-off-by: John Keeping <john@keeping.me.uk>
Lukas Fleischer [Mon, 4 Mar 2013 08:18:38 +0000 (09:18 +0100)]
Makefile: Disable gettext in the Git submodule
Newer libgit versions depend on the libintl library. However, we
currently do not link against libintl which breaks compilation under
OpenBSD:
git/libgit.a(commit.o)(.text+0x1d1b): In function `lookup_commit_or_die':
git/gettext.h:47: undefined reference to `libintl_gettext'
[...]
Since we do not support i18n in cgit, just disable gettext in the Git
submodule to fix this.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Jamie Couture [Sat, 17 Nov 2012 18:02:17 +0000 (13:02 -0500)]
Makefile: improve dependency generation
Makefile target generation would always be included for any makefile
target that was not clean. Only care to include the '.deps' directory
when building cgit, rather than generating and including dependencies
when calling other makefile targets.
Heavily borrowed from git's Makefile, but without definitions to test
for the compiler's header dependency feature. Previous Makefile
implementation never checked for this compiler feature anyway.
- Removed makecmdgoal 'clean' check
- Grouped like .PHONY target definitions
- Place build dependency targets under .SUFFIXES
- Re-arranged location of library inclusion definitions
- Use google code mirror instead of github
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Lukas Fleischer [Sun, 3 Mar 2013 21:42:35 +0000 (22:42 +0100)]
cgit.c: Remove parameter from guess_defbranch()
We use resolve_ref() since commit
8d7c2ec2, so this is no longer needed.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Sun, 3 Mar 2013 16:22:30 +0000 (17:22 +0100)]
ui-tree.c: Use a context structure in walk_tree()
Use the context pointer to pass context information instead of misusing
global variables, as we already did in "ui-blob.c" and in "ui-plain.c".
In addition to the fixes to walk_tree(), pass the same structure to
ls_tree() and ls_item() which is read_tree_recursive()-based as well.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Sun, 3 Mar 2013 15:55:21 +0000 (16:55 +0100)]
ui-tree.c: Drop the header variable
Instead, use the value of the state variable to determine whether the
footer needs to be drawn.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Sun, 3 Mar 2013 15:49:47 +0000 (16:49 +0100)]
ui-tree.c: Declare the state variable globally
This allows for removing the header variable in a following patch. We
can use the state variable to check whether the tail needs to be printed
instead.
Note that the state variable will be moved into a context structure
later.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Sun, 3 Mar 2013 15:45:14 +0000 (16:45 +0100)]
ui-tree.c: Pass current revision to print_object()
No longer access the global curr_rev variable in print_object().
This will make it easier to squash the curr_rev variable into a context
structure without having to pass the context to the print_object()
function.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Sun, 3 Mar 2013 16:27:54 +0000 (17:27 +0100)]
ui-plain.c: Use a context structure in walk_tree()
Do not misuse global variables to save the context. Instead, use the
context pointer which was designed to share information between a
read_tree_fn and the caller.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Sun, 3 Mar 2013 16:10:19 +0000 (17:10 +0100)]
ui-plain.c: Do not access match variable in print_*()
Move all code setting the match variable to walk_tree().
This allows for easily moving this variable into a context structure
without having to pass the context to print_*().
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Sun, 3 Mar 2013 16:27:46 +0000 (17:27 +0100)]
ui-blob.c: Use a context structure in walk_tree()
Do not misuse global variables to save the context. Instead, use the
context pointer which was designed to share information between a
read_tree_fn and the caller.
This also prevents from potential misuse of the global pointers
match_path and matched_sha1 after the referenced values have been
overwritten on the stack.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Jason A. Donenfeld [Mon, 4 Mar 2013 04:41:53 +0000 (23:41 -0500)]
ui-snapshot.c: Fill argv[0] with dummy.
parse_archive_args does not pass PARSE_OPT_KEEP_ARGV0 to parse_args,
which means the first argument will be discarded, as though it were a
function being called from the command-line. Thus, we fill argv[0] with
a dummy argument to prevent this from happening.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld [Mon, 4 Mar 2013 04:21:33 +0000 (23:21 -0500)]
White space around control verbs.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Lukas Fleischer [Sun, 3 Mar 2013 15:04:29 +0000 (16:04 +0100)]
Fix several whitespace errors
* Remove whitespace at the end of lines.
* Replace space indentation by tabs.
* Add whitespace before/after several operators ("+", "-", "*", ...)
* Add whitespace to assignments ("foo = bar;").
* Fix whitespace in parameter lists ("foobar(foo, bar, 42)").
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
John Keeping [Sat, 2 Mar 2013 12:32:15 +0000 (12:32 +0000)]
Update git to v1.7.12.4
No changes needed.
Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping [Sat, 2 Mar 2013 12:32:14 +0000 (12:32 +0000)]
Update git to v1.7.9.7
resolve_ref() is renamed to resolve_ref_unsafe(). CGit's usage is safe.
Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping [Sat, 2 Mar 2013 12:32:13 +0000 (12:32 +0000)]
Update git to v1.7.8.6
No changes required.
Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping [Sat, 2 Mar 2013 12:32:12 +0000 (12:32 +0000)]
Update git to v1.7.7.7
This release changes the archive interface so that we now need to pass
argv into write_archive().
Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping [Sat, 2 Mar 2013 12:32:11 +0000 (12:32 +0000)]
Update git to v1.7.6.5
struct pathspec is now used in more places.
Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping [Sat, 2 Mar 2013 12:32:10 +0000 (12:32 +0000)]
Update git to v1.7.5.4
Some changes to diff options:
- no_merges has become the more general max_parents
- path restriction now uses struct pathspec
Signed-off-by: John Keeping <john@keeping.me.uk>
stfn [Wed, 27 Feb 2013 18:47:17 +0000 (19:47 +0100)]
Print submodule revision next to submodule link
Jason A. Donenfeld [Fri, 1 Feb 2013 20:08:51 +0000 (21:08 +0100)]
Support unannotated tags in git-clone.
Matthew McClintock reported that older unannotated tags were not
correctly being cloned and did not appear in info/refs. Further
investigation revealed some dubious prefix comparison code for
determining whether or not to write refs in info/refs. After comparing
it with git's own http-backend.c, it appears upstream does not use this
prefix logic.
OTOH, I don't know what the reasoning was when the prefix logic was
introduced. It appears to me to just be buggy, though it's possible
there are other reasons, and we'll have to revisit this commit.
But for now, Works For Me.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Matthew McClintock <msm@freescale.com>
Reported-by: Matthew McClintock <msm@freescale.com>
Julius Plenz [Thu, 15 Nov 2012 16:35:06 +0000 (17:35 +0100)]
ssdiff: correctly manage tab expansion
Previously, replace_tabs("foo\tbar") would become " foobar".
Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Florian Pritz [Fri, 1 Feb 2013 09:59:13 +0000 (10:59 +0100)]
Make "owner" column on index page configurable
This is not really needed for personal sites where all repos belong to
the same person. Since it is pretty useful for shared sites however, it
should be configurable.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld [Thu, 15 Nov 2012 16:21:47 +0000 (17:21 +0100)]
man: fix up default value duplication
Jason A. Donenfeld [Thu, 15 Nov 2012 00:28:59 +0000 (01:28 +0100)]
CGIT-0.9.1
Enhancements:
- path-selected submodule links
- intelligent default branch guessing
- /etc/mime.types lookup
- gitweb.* and cgit.* git-config support
- case insensitive sorting and age sorting
- commit, repository, and section sorting
- bold currently viewed page in pagination
- support BSDs in makefile
Security:
- CVE-2012-4465: heap-buffer overflow in parsing.c
- CVE-2012-4548: syntax highlighting command injection
Bug Fixes:
- transition maintainer to Jason Donenfeld (zx2c4)
- download git snapshot from github instead of Lars' old server
- css fixes
- stablization of tests
- more compatible default highlight script
- suppress gzip timestamp so that tarballs only use tar timestamps
- treat ctags as target in makefile
- do not let global variables override certain local repo settings
- print ampersand as proper html entity
- use placeholder for empty commit subject
- format diff view for addition and removal of files
- point links at correct blob from ssdiff
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld [Thu, 15 Nov 2012 00:26:06 +0000 (01:26 +0100)]
man: show mime type default value
Julius Plenz [Tue, 30 Oct 2012 12:56:01 +0000 (13:56 +0100)]
ssdiff: point line links at exact blob by prepending "id="
Previously, the id_str (i.e. the current or diffed-against commit's
SHA1 ID) was simply concatenated to the URL. Now, prepend an "id="
string so that the links actually point to the right blobs and thus
the exact lines.
Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Michael Halstead [Wed, 14 Nov 2012 20:41:01 +0000 (12:41 -0800)]
Format git diff headers correctly when adding or removing files.
Copying the output of cgit and using it in patches now works when adding
files to or removing files from the repository. This is helpful for people
who use cgit in their patch workflow.
Ferry Huberts [Sat, 3 Nov 2012 23:49:45 +0000 (17:49 -0600)]
Makefile: get snapshots from github
Github will have more bandwidth than Lars' server.
Jamie Couture [Wed, 31 Oct 2012 23:43:12 +0000 (19:43 -0400)]
Makefile: remove tags file
Remove tags file from working directory.
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
Christian Franke [Sun, 28 Oct 2012 17:36:08 +0000 (18:36 +0100)]
ui-shared: use placeholder for empty commit subject
Display a placeholder when creating links to commits with empty subjects.
This avoids the creation of links of the form <a></a>.
Jason A. Donenfeld [Sun, 28 Oct 2012 02:03:41 +0000 (20:03 -0600)]
syntax-highlighting.sh: Fix command injection.
By not quoting the argument, an attacker with the ability to add files
to the repository could pass arbitrary arguments to the highlight
command, in particular, the --plug-in argument which can lead to
arbitrary command execution.
This patch adds simple argument quoting.
Jason A. Donenfeld [Thu, 18 Oct 2012 21:36:44 +0000 (23:36 +0200)]
Fix man page typo.
Jason A. Donenfeld [Wed, 17 Oct 2012 19:55:48 +0000 (21:55 +0200)]
Makefile: Support OpenBSD just like FreeBSD
Jason A. Donenfeld [Wed, 17 Oct 2012 16:30:08 +0000 (18:30 +0200)]
Makefile: support FreeBSD libiconv paths
According to Dan Rue <drue@therub.org>, FreeBSD requires the lib paths
to get libiconv from /usr/local.
Jason A. Donenfeld [Wed, 17 Oct 2012 15:17:48 +0000 (17:17 +0200)]
tests: check for proper html entity
Since we're now properly writing ampersand literals as & instead of
as a plain &, we need to update the test accordingly.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tobias Bieniek [Sat, 13 Oct 2012 14:10:30 +0000 (16:10 +0200)]
ui-log: Add "commit-sort" option for controlling commit ordering
This makes it possible to use strict commit date ordering or strict
topological ordering by passing the corresponding flags to "git log".
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tobias Bieniek [Tue, 9 Oct 2012 18:53:29 +0000 (20:53 +0200)]
ui-repolist: Add "section-sort" flag to control section sorting.
Flag which, when set to "1", will sort the sections on the repository
listing by name. Set this flag to "0" if the order in the cgitrc file
should be preserved. Default value: "1".
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld [Tue, 9 Oct 2012 10:56:14 +0000 (06:56 -0400)]
scan-tree: Unify gitweb.* and cgit.* settings into one config option.
After some back and forth with Jamie and René, it looks like the git
config semantics are going to be like this:
- gitweb.category maps to the cgit repo config key "section"
- gitweb.description maps to the cgit repo config key "desc"
- gitweb.owner maps to the cgit repo config key "owner"
- cgit.* maps to all cgit repo config keys
This option can be enabled with "enable-git-config=1", and replaces
all previous "enable-gitweb-*" config keys.
The order of operations is as follows:
- git config settings are applied in the order that they exist in
the git config file
- if the owner is not set from git config, get the owner using the
usual getpwuid call
- if the description is not set from git config, look inside the
static $path/description file
- if section-from-path=1, override whatever previous settings were
inside of git config using the section-from-path logic
- parse $path/cgitrc for local repo.* settings, that override all
previous settings
William Bell [Tue, 9 Oct 2012 18:45:58 +0000 (20:45 +0200)]
ui: Remember to print ampersand as proper html entities.
Jason A. Donenfeld [Tue, 16 Oct 2012 21:32:40 +0000 (23:32 +0200)]
ui-repolist: Rename section-sort to repository-sort.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Tobias Bieniek [Wed, 18 Apr 2012 10:32:13 +0000 (12:32 +0200)]
repo_config: do not let globals override repo settings
This makes it possible to activate the enable_commit_graph,
enable_log_filecount, and enable_log_linecount for individual
repositories, even if the global setting is "0" (default).
The commit that introduced the broken behavior was
e189344, and the
commit message of that makes it clear that this wasn't the intended
behavior.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld [Tue, 9 Oct 2012 11:21:30 +0000 (13:21 +0200)]
README: times, they are a-changin
Ferry Huberts [Tue, 9 Oct 2012 11:10:48 +0000 (13:10 +0200)]
syntax-highlight: when the file has no extension, assume text
There are 2 situations:
1- empty extension: assuming text is better than highlight
producing no output because of a missing argument.
2- no extension at all: assuming text is better than setting
the extension to the filename, which is what now happens.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 9 Oct 2012 11:09:58 +0000 (13:09 +0200)]
ui-repolist: do not use agefile if it's date could not be parsed
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 9 Oct 2012 11:08:30 +0000 (13:08 +0200)]
Revert "filters/syntax-highlighting.sh: work around highlight --force bug"
This reverts commit
f50be7fda0a7ab57009169dd5905fcbab8eb5166.
An update with the latest highlight landed in EPEL. This new version
doesn't have the --force bug, so the workaround can now be removed.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Jamie Couture [Mon, 8 Oct 2012 17:12:17 +0000 (13:12 -0400)]
Makefile: add tag target to generate ctags
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
Jamie Couture [Mon, 8 Oct 2012 16:49:34 +0000 (12:49 -0400)]
ui-repolist: Bold the currently viewed page.
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
Jim Meyering [Mon, 23 Apr 2012 20:06:35 +0000 (22:06 +0200)]
do not write outside heap buffer
* parsing.c (substr): Handle tail < head.
This started when I noticed some cgit segfaults on savannah.gnu.org.
Finding the offending URL/commit and then constructing a stand-alone
reproducer were far more time-consuming than writing the actual patch.
The problem arises with a commit like this, in which the user name
part of the "Author" field is empty:
$ git log -1
commit
6f3f41d73393278f3ede68a2cb1e7a2a23fa3421
Author: <T at h.or>
Date: Mon Apr 23 22:29:16 2012 +0200
Here's what happens:
(this is due to buf=malloc(0); strncpy (buf, head, -1);
where "head" may point to plenty of attacker-specified non-NUL bytes,
so we can overwrite a zero-length heap buffer with arbitrary data)
Invalid write of size 1
at 0x4A09361: strncpy (mc_replace_strmem.c:463)
by 0x408977: substr (parsing.c:61)
by 0x4089EF: parse_user (parsing.c:73)
by 0x408D10: cgit_parse_commit (parsing.c:153)
by 0x40A540: cgit_mk_refinfo (shared.c:171)
by 0x40A581: cgit_refs_cb (shared.c:181)
by 0x43DEB3: do_for_each_ref (refs.c:690)
by 0x41075E: cgit_print_branches (ui-refs.c:191)
by 0x416EF2: cgit_print_summary (ui-summary.c:56)
by 0x40780A: summary_fn (cmd.c:120)
by 0x40667A: process_request (cgit.c:544)
by 0x404078: cache_process (cache.c:322)
Address 0x4c718d0 is 0 bytes after a block of size 0 alloc'd
at 0x4A0884D: malloc (vg_replace_malloc.c:263)
by 0x455C85: xmalloc (wrapper.c:35)
by 0x40894C: substr (parsing.c:60)
by 0x4089EF: parse_user (parsing.c:73)
by 0x408D10: cgit_parse_commit (parsing.c:153)
by 0x40A540: cgit_mk_refinfo (shared.c:171)
by 0x40A581: cgit_refs_cb (shared.c:181)
by 0x43DEB3: do_for_each_ref (refs.c:690)
by 0x41075E: cgit_print_branches (ui-refs.c:191)
by 0x416EF2: cgit_print_summary (ui-summary.c:56)
by 0x40780A: summary_fn (cmd.c:120)
by 0x40667A: process_request (cgit.c:544)
Invalid write of size 1
at 0x4A09400: strncpy (mc_replace_strmem.c:463)
by 0x408977: substr (parsing.c:61)
by 0x4089EF: parse_user (parsing.c:73)
by 0x408D10: cgit_parse_commit (parsing.c:153)
by 0x40A540: cgit_mk_refinfo (shared.c:171)
by 0x40A581: cgit_refs_cb (shared.c:181)
by 0x43DEB3: do_for_each_ref (refs.c:690)
by 0x41075E: cgit_print_branches (ui-refs.c:191)
by 0x416EF2: cgit_print_summary (ui-summary.c:56)
by 0x40780A: summary_fn (cmd.c:120)
by 0x40667A: process_request (cgit.c:544)
by 0x404078: cache_process (cache.c:322)
Address 0x4c7192b is not stack'd, malloc'd or (recently) free'd
Invalid write of size 1
at 0x4A0940E: strncpy (mc_replace_strmem.c:463)
by 0x408977: substr (parsing.c:61)
by 0x4089EF: parse_user (parsing.c:73)
by 0x408D10: cgit_parse_commit (parsing.c:153)
by 0x40A540: cgit_mk_refinfo (shared.c:171)
by 0x40A581: cgit_refs_cb (shared.c:181)
by 0x43DEB3: do_for_each_ref (refs.c:690)
by 0x41075E: cgit_print_branches (ui-refs.c:191)
by 0x416EF2: cgit_print_summary (ui-summary.c:56)
by 0x40780A: summary_fn (cmd.c:120)
by 0x40667A: process_request (cgit.c:544)
by 0x404078: cache_process (cache.c:322)
Address 0x4c7192d is not stack'd, malloc'd or (recently) free'd
Process terminating with default action of signal 11 (SIGSEGV)
Access not within mapped region at address 0x502F000
at 0x4A09400: strncpy (mc_replace_strmem.c:463)
by 0x408977: substr (parsing.c:61)
by 0x4089EF: parse_user (parsing.c:73)
by 0x408D10: cgit_parse_commit (parsing.c:153)
by 0x40A540: cgit_mk_refinfo (shared.c:171)
by 0x40A581: cgit_refs_cb (shared.c:181)
by 0x43DEB3: do_for_each_ref (refs.c:690)
by 0x41075E: cgit_print_branches (ui-refs.c:191)
by 0x416EF2: cgit_print_summary (ui-summary.c:56)
by 0x40780A: summary_fn (cmd.c:120)
by 0x40667A: process_request (cgit.c:544)
by 0x404078: cache_process (cache.c:322)
This happens when tail - head == -1 here:
(parsing.c)
char *substr(const char *head, const char *tail)
{
char *buf;
buf = xmalloc(tail - head + 1);
strncpy(buf, head, tail - head);
buf[tail - head] = '\0';
return buf;
}
char *parse_user(char *t, char **name, char **email, unsigned long *date)
{
char *p = t;
int mode = 1;
while (p && *p) {
if (mode == 1 && *p == '<') {
*name = substr(t, p - 1);
t = p;
mode++;
} else if (mode == 1 && *p == '\n') {
The fix is to handle the case of (tail < head) before calling xmalloc,
thus avoiding passing an invalid value to xmalloc.
And here's the reproducer:
It was tricky to reproduce, because git prohibits use of an empty "name"
in a commit ID. To construct the offending commit, I had to resort to
using "git hash-object".
git init -q foo &&
( cd foo &&
echo a > j && git add . && git ci -q --author='au <T at h.or>' -m. . &&
h=$(git cat-file commit HEAD|sed 's/au //' \
|git hash-object -t commit -w --stdin) &&
git co -q -b test $h &&
git br -q -D master &&
git br -q -m test master)
git clone -q --bare foo foo.git
cat <<EOF > in
repo.url=foo.git
repo.path=foo.git
EOF
CGIT_CONFIG=in QUERY_STRING=url=foo.git valgrind ./cgit
The valgrind output is what you see above.
AFAICS, this is not exploitable thanks (ironically) to the use of strncpy.
Since that -1 translates to SIZE_MAX and this is strncpy, not only does it
copy whatever is in "head" (up to first NUL), but it also writes
SIZE_MAX - strlen(head) NUL bytes into the destination buffer, and that
latter is guaranteed to evoke a segfault. Since cgit is single-threaded,
AFAICS, there is no way that the buffer clobbering can be turned into
an exploit.
Jason A. Donenfeld [Wed, 26 Sep 2012 00:56:38 +0000 (02:56 +0200)]
ui-snapshot: pass -n to gzip, to suppress timestamp
Since cgit snapshots of tags are often used for releases, we don't
want the rarely used feature of the gzip compressor that includes
an embedded timestamp into the archive, since this makes each tarball
of the same (potentially signed) tag different.
This commit refactors the archive handling code a bit so that each
different format is able to run with an arbitrary argv for the filter.
Jason A. Donenfeld [Thu, 12 Jul 2012 18:00:40 +0000 (20:00 +0200)]
Update copyright headers to have latest dates.
Jason A. Donenfeld [Thu, 12 Jul 2012 17:13:39 +0000 (19:13 +0200)]
ui-repolist: Case insensitive sorting and age sort
Add two options, one for doing the ordinary name sorts in a
case-insensitive manner, and another for choosing to sort repos in each
section by age instead of by name.
Jason A. Donenfeld [Wed, 11 Jul 2012 03:32:45 +0000 (05:32 +0200)]
scan-tree: Support gitweb.category.
Use gitweb.category from git config to determine repo's section, if
option is enabled.
Jason A. Donenfeld [Wed, 11 Jul 2012 02:24:01 +0000 (04:24 +0200)]
scan-tree: Support gitweb.description.
Use gitweb.description instead of description file to determine
description, if option is enabled.
Ferry Huberts [Mon, 19 Mar 2012 22:09:25 +0000 (23:09 +0100)]
css: only use div#cgit
Don't bother with 'body' and 'div#cgit form', since
everything is wrapped in 'div#cgit' already.
Removing these two types makes embedding even easier.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Lars Hjemli [Sun, 18 Mar 2012 21:01:28 +0000 (21:01 +0000)]
Merge branch 'fh/mimetypes'
Lars Hjemli [Sun, 18 Mar 2012 21:00:18 +0000 (21:00 +0000)]
Merge branch 'jp/defbranch'
Lars Hjemli [Sun, 18 Mar 2012 20:59:36 +0000 (20:59 +0000)]
Merge branch 'lh/module-links'
Lars Hjemli [Sun, 18 Mar 2012 20:23:30 +0000 (20:23 +0000)]
Merge branch 'stable'
Ferry Huberts [Sun, 18 Mar 2012 10:44:05 +0000 (11:44 +0100)]
css: force text color to black on decorations
improves readability when embedding into a page that
has the text color set to a different color
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sun, 18 Mar 2012 10:44:04 +0000 (11:44 +0100)]
css: vertically align the cgit logo image
When embedding cgit in other pages, the logo alignment needs to be
specified to avoid any css rules from the embedding page to make the
page look bad.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sun, 18 Mar 2012 10:44:03 +0000 (11:44 +0100)]
css: prefix all styles with div#cgit
to facilitate easier embedding
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sun, 18 Mar 2012 11:48:01 +0000 (11:48 +0000)]
filters/syntax-highlighting.sh: work around highlight --force bug
Ferry Huberts [Sun, 18 Mar 2012 11:38:26 +0000 (11:38 +0000)]
filters/highlight.sh: manually support highlight version 2 and 3
Ferry Huberts [Sun, 18 Mar 2012 10:43:50 +0000 (11:43 +0100)]
tests: properly quote arguments to printf
v2: incorporate remarks of Lukas
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Sun, 18 Mar 2012 10:43:49 +0000 (11:43 +0100)]
tests: handle paths with whitespace
v2: incorporate remarks of Lukas
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Lars Hjemli [Sun, 18 Mar 2012 10:19:59 +0000 (10:19 +0000)]
Merge branch 'stable'
Lars Hjemli [Sun, 18 Mar 2012 10:16:27 +0000 (10:16 +0000)]
CGIT-0.9.0.3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lars Hjemli [Sun, 18 Mar 2012 10:10:10 +0000 (10:10 +0000)]
Merge branch 'stable'
Eric Wong [Wed, 4 Jan 2012 09:01:51 +0000 (09:01 +0000)]
segfault fix on some bogus requests
ctx.qry.head can be NULL in some cases due to bad requests
by weird bots. I managed to reproduce with:
PATH_INFO=/repo.git/shop.php QUERY_STRING=id=
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Jamie Couture [Thu, 12 Jan 2012 03:38:49 +0000 (22:38 -0500)]
use correct type for sizeof
**L would have worked well too. Depending on the distribution sizeof *L
may return 8 instead of 4. **L is preferable, but since we don't expect
this datatype to change very often, sizeof int is less subtle and easier
to understand.
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
Eric Wong [Wed, 4 Jan 2012 08:59:15 +0000 (08:59 +0000)]
ui-ssdiff.c: correct length check for LCS table
Each individual string may be too long for its respective
dimension of the LCS table.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Lars Hjemli [Tue, 3 Jan 2012 21:19:29 +0000 (21:19 +0000)]
Merge branch 'stable'
John Keeping [Thu, 24 Nov 2011 11:54:47 +0000 (11:54 +0000)]
Fix segmentation fault in empty repository
When a repository is empty, the ATOM feed link is written in the header,
but this involves formatting ctx->qry.head which is NULL in this case.
With glibc, vsnprintf formats "%s" with a NULL input as "(null)" but on
Solaris this results in a segmentation fault. Since we don't have a
meaningful head for the atom feed in an empty repository, it's simplest
not to write out the link element at all.
Signed-off-by: John Keeping <john@metanate.com>
Lars Hjemli [Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)]
Merge branch 'stable'
Lars Hjemli [Tue, 3 Jan 2012 16:43:33 +0000 (16:43 +0000)]
Makefile: fetch git tarballs from http://hjemli.net/git/git/
The git tarballs are currently not available from kernel.org, so for now
the makefile will download autogenerated tarballs from cgit.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Norberto Lopes [Wed, 23 Nov 2011 01:59:26 +0000 (17:59 -0800)]
fix css color value and vertical-align value
Tim Chen [Tue, 3 Jan 2012 16:09:59 +0000 (16:09 +0000)]
ui-ssdiff.c: set correct diffmode in "control panel"
When side-by-side-diffs=1 was set in cgitrc, specifying 'ss=0' in the
querystring would not set the 'unified' option as active in the dropdown
box used to select diffmode.
Lars Hjemli [Tue, 3 Jan 2012 16:06:58 +0000 (16:06 +0000)]
Merge branch 'stable'
Tim Chen [Tue, 3 Jan 2012 16:02:14 +0000 (16:02 +0000)]
Fix diff mode switching when side-by-side-diffs=1
When side-by-side-diffs=1 was set in cgitrc, specyfing 'ss=0' in the query-
string would not switch to unified diffs. This patch fixes the issue by
introducing a separate variable to track the occurrence of "ss" in the
querystring.
Georg Müller [Tue, 3 Jan 2012 15:30:50 +0000 (15:30 +0000)]
ui-log.c: do not show remote heads if enable-remote-branches=0
If remote branches are not enabled, the branches are still listed in
the log view. This patch removes them if enable-remote-branches=0.
Tobias Grimm [Sun, 31 Jul 2011 00:44:05 +0000 (02:44 +0200)]
Add sort parameter to pager of repo list
When the repolist is paged, the page-links are missing the sort parameter,
causing the initial page to be custom sorted, but any clicked page will
then be with the default sort order again.
Jamie Couture [Sat, 17 Sep 2011 22:25:01 +0000 (18:25 -0400)]
ui-ssdiff: move LCS table away from the stack
Printing deferred line changes for files containing long lines would
cause a segfault.
- limit LCS table size: 128x128.
- move LCS table to global context: avoid allocating/freeing memory
for every deferred line change.
Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
Lukas Fleischer [Wed, 14 Sep 2011 09:52:43 +0000 (11:52 +0200)]
shared.c: Only setenv() if value is non-null
Some setenv() implementations (e.g. the one in OpenBSD's stdlib)
segfault if we pass a NULL value. Only set environment variables if the
corresponding settings are defined to avoid this.
Note that this is a minor behaviour change as environment variables were
supposed to be set to an empty string if a setting was undefined. Given
that this feature isn't part of any official release yet, there's no
need to worry about backwards compatibility, really. Change the
documentation accordingly.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer [Fri, 22 Jul 2011 15:15:49 +0000 (17:15 +0200)]
shared.c: Remove unused "linux/limits.h" include
This isn't used anywhere and prevents the code from being compiled on
other platforms, such as *BSD.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lars Hjemli [Fri, 22 Jul 2011 12:22:17 +0000 (12:22 +0000)]
Merge branch 'stable'
Lukas Fleischer [Fri, 22 Jul 2011 11:47:19 +0000 (13:47 +0200)]
Fix potential XSS vulnerability in rename hint
The file name displayed in the rename hint should be escaped to avoid
XSS. Note that this vulnerability is only applicable when an attacker
has gained push access to the repository.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lukas Fleischer [Thu, 21 Jul 2011 21:04:53 +0000 (23:04 +0200)]
Remove dead initialization in cgit_parse_commit()
The value stored to "t" during its initialization gets overwritten in
any case, so just leave it uninitialized. Spotted by clang-analyzer.
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lars Hjemli [Thu, 21 Jul 2011 14:27:03 +0000 (14:27 +0000)]
Merge branch 'stable'
Lars Hjemli [Thu, 21 Jul 2011 14:23:50 +0000 (14:23 +0000)]
CGIT 0.9.0.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Eric Wong [Thu, 21 Jul 2011 03:24:54 +0000 (03:24 +0000)]
html.c: avoid out-of-bounds access for url_escape_table
This fixes a segfault for me with with -O2 optimization on x86
with gcc (Debian 4.4.5-8) 4.4.5
I can reliably reproduce it with the following parameters
when pointed to the git.git repository:
PATH_INFO='/git-core.git/diff/'
QUERY_STRING='id=
2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5&id2=
d6da71a9d16b8cf27f9d8f90692d3625c849cbc8'
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lars Hjemli [Thu, 21 Jul 2011 12:50:07 +0000 (12:50 +0000)]
Merge branch 'stable'
Ferry Huberts [Thu, 21 Jul 2011 12:43:54 +0000 (14:43 +0200)]
tests: fix failures when CDPATH is set
Some tests would otherwise fail because commands such as
cd trash/repos/foo && git rev-list --reverse HEAD | head -1
would return 2 lines instead of 1: the 'cd' command also
prints the path when CDPATH is set.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Lars Hjemli [Tue, 19 Jul 2011 09:34:18 +0000 (09:34 +0000)]
ui-repolist.c: fallback to "master" if no default branch is specified
When looking for the modtime of a repo we used to rely on repo.defbranch
having a value. This is no longer true so this patch provides a default
value when needed.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Ferry Huberts [Tue, 19 Jul 2011 08:51:58 +0000 (10:51 +0200)]
ui_plain: automatically lookup mimetype when mimetype-file is set
For sites that do not want to configure mime types by hand but
still want the correct mime type for 'plain' blobs, configuring
a mime type file is made possible. This is handy since such a
file is normally already provided (at least on Linux systems).
Also, this reflects the gitweb option '$mimetypes_file'
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Ferry Huberts [Mon, 18 Jul 2011 10:45:56 +0000 (12:45 +0200)]
Makefile: fix oversight of not using $(DESTDIR) in uninstall
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>