summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update BouncyCastle to version 1.69Florian Zschocke2022-10-253-40/+18
| | | | | | | | | | | The version 1.69 is chosen instead of 1.70, because the moxie build would not download the jars, trying to download `...1.7.jar` instead. Three class deprecations are fixed. `PEMWriter` and `X509Extension` are replaced with their drop-in replacements `JcaPEMWriter` and `Extension`. The `PasswordFinder` deprecation note says that "it is no longer used". It also was never used in Gitblit's code, so it is removed from the key par provider class.
* Merge pull request #1428 from urkle/fix-ptFlorian Zschocke2022-10-221-7/+7
|\ | | | | Correct is/is not usage in pt.py to not be used with the value is a literal
| * Correct is/is not usage in pt.py to not be used with the value is a literalEdward Rudd2022-10-101-7/+7
| | | | | | | | - new python 3 versions warn/errors about this usage
* | Update dependency MINA SSHD to version 1.7.0Florian Zschocke2022-10-092-4/+7
| |
* | upgrade to sshd 1.6.0, add eddsa dependency, upgrade jgit to 4.1.2ricardop2022-10-085-21/+30
|/ | | | | | | | | (cherry picked from commit d8fbdda2ab3fa48e92bdf37399d4b75c48409c5c@rpardini:master) # Conflicts: # .classpath # build.moxie # src/test/java/com/gitblit/tests/SshUnitTest.java
* Use existing setting but with new valuesFlorian Zschocke2022-08-143-11/+43
| | | | | | | | | | | Instead of adding another setting and having to explain how the new one and the existing `requireClientCertificates` setting are interdependent, let's use the existing setting and add new values. It is changed from a boolean to a string, with the values `required`, `optional` and `disabled`. To keep backward compatibility with the old values, the `true` value is mapped to `required` and the `false` value is mapped to `optional`.
* Merge branch 'disable-client-certs' of github.com:oddeirik/gitblit into ↵Florian Zschocke2022-08-142-3/+15
|\ | | | | | | oddeirik-disable-client-certs
| * Add setting to explicitly enable or disable optional client certificates.Odd Eirik Nes2016-10-172-3/+15
| |
* | Rewrite fix without the additional ListFlorian Zschocke2022-08-071-17/+10
| | | | | | | | | | | | This also removes the additional Set. What changes is that the order of the repositories is kept, but the resulting list will have user and team permissions intertwined.
* | Add init test for getting repository permissionsFlorian Zschocke2022-08-071-0/+49
| |
* | fix user effective permission display if users is in multiple groups with ↵kaspars.kurms2022-08-071-0/+13
| | | | | | | | different permissions
* | Add more tests for tab expansionFlorian Zschocke2022-08-021-3/+21
| | | | | | | | These show more clearly what the code is supposed to do.
* | Fix: if statement without curly bracesQuentin2022-08-021-1/+2
| |
* | Tab to space conversion testingQuentin2022-08-021-3/+13
| |
* | Changed tab to space conversionQuentin2022-08-021-1/+8
| | | | | | | | | | Tabs are not always 4 spaces large. It completes the line to the 4th character.
* | pages: Fix link for GitExtension, which moved to GithubFlorian Zschocke2022-04-0913-13/+13
| |
* | doc: Fix download link for fedclient ad api tarFlorian Zschocke2022-04-092-2/+2
| | | | | | | | | | | | It was still pointing to Google Code. This closes #1408
* | doc: Fix links for dependencies that moved from Google CodeFlorian Zschocke2022-04-092-6/+6
| |
* | Merge branch '1410-vulnerability-userdb' into masterFlorian Zschocke2022-03-143-6/+382
|\ \ | | | | | | | | | | | | Merge fix branch from 1.9 mainenance line into master branch.
| * | fix: Fix StoredUserConfig not escaping control charactersFlorian Zschocke2022-03-132-3/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `StoredUserConfig` only escaped the escape character, i.e. backslash. But it does not escape control characters like tab or newline. This introduces a vulnerability where an attacker can create new entries in their user account and create new accounts. In addition, other characters are also not properly handled. Field values with a comment character need to be quoted. This only happens for the `#` character and only when the value starts with it. Also the quote is note escaped in values. This change completely rewrites the `escape` method of `StoredUserConfig`. It takes care of properly escaping characters that need escaping for the git configuration file format. This fixes #1410
| * | fix: Fix StoredUserConfig handling null subsectionsFlorian Zschocke2022-03-132-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Te `StoredUserConfig` did not handle sections without a subsection. When the subsection did not exist, i.e. was `null`, then the subsection name would be set to the string "null". This is not how the config file format works. It should create a `[SECTIONNAME]` entry instead. This fix handles a `null` subsection correctly, by handling it as a section without a subsection.
| * | test: Add exploit test for config user serviceFlorian Zschocke2022-03-121-1/+126
| | | | | | | | | | | | | | | Add unit tests for exploiting the email address or display name in the config user service by using newlines in the values.
* | | doc: Update documentation for new Java 8 minimumFlorian Zschocke2022-02-061-1/+1
|/ /
* | site: Fix awful HTML indentationFlorian Zschocke2022-02-031-18/+18
| |
* | site: Old packages moved from Bintray to CloudsmithFlorian Zschocke2022-02-031-0/+2
| | | | | | | | | | | | | | Since Bintray seized operation, the packages for versions 1.4.0 - 1.8.0 have been uploaded to Cloudsmith. Adjust the links appropriately. An attribution is added to comply with Cloudsmith's OSS hosting policy.
* | Update japanese translationTakehide Morimoto2022-01-156-170/+1271
| |
* | Detect and report if running in containerFlorian Zschocke2021-12-102-0/+76
| | | | | | | | | | | | | | To help with analysis, try to detect if the instance is running inside a container. Some containers are detected, but this is probably not exhaustive. At least a Docker container should be detectable. Report in the runtime manager to the log if a container was detected.
* | run: Put variables in quotes in shell scriptsFlorian Zschocke2021-12-093-4/+4
| |
* | pages: Fix repo-relative reference links in markdown docsFlorian Zschocke2021-12-062-15/+40
| | | | | | | | | | | | | | | | As with explicit links, also for reference links in markdown documents which point to repository-relative files the links are broken. They do not take the path to the repository into account. This fix is related to commit b23269 which fixed issue #1358 for explicit links.
* | bug: Fix double encoding links in Markdown/Wiki pagesFlorian Zschocke2021-12-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | When parsing Markdown or Wiki pages, links get URL encoded. This happened twice for links to other documents. Once explicitly and once by Wicket when it creates a `urlFor` the page. That results in multi-byte characters getting percent escaped, and then the percent character again getting percent escaped. The explicit encoding looks like a forgotten left over, so it gets removed from the code. The Wicket encoding is smarter anyways, knowing what is path and what is parameter. This fixes #864.
* | Add tests for MarkupProcessorFlorian Zschocke2021-12-041-0/+734
| |
* | docs: Update docker URLFlorian Zschocke2021-11-251-0/+1
| | | | | | | | | | | | | | Update the URL to the Gitblit docker image to point to the `gitblit/gitblit` repository, which I now consider the official Docker repository. Also link to the Docker images on the main page.
* | Fixes external links broken in markdown rendering (#1392)TomaszSzt2021-11-181-0/+16
| | | | | | | | | | * This commit fixes what was broken in commit https://github.com/gitblit/gitblit/commit/b23269acc0f460f583311c679d751925b8402563 due to #1358 issue
* | Fix NPETom2021-11-031-7/+3
| | | | | | | | | | | | | | | | Although it seems strange to have a RefModel with a referenced object but a null Ref, Gitblit uses such RefModels for instance in JGitUtils.getNotesOnCommit(). Be careful to do something sensible when that Ref is null.
* | Issue #1011: do not serialize JGit commit objectsTom2021-11-0313-97/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit commit objects are a recursive data structure; they have links to their parent commits. Serializing a JGit commit will try to recursively serialize all reachable ancestors as faras they have been loaded. If that ancestor chain is too long, a StackOverflowError is thrown during Wicket's page serialization if a page has a reference to sucha JGit commit. Fixed by making sure that pages o not contain references to JGit commits. Use the (existing) wrapper object RepositoryCommit instead. * RepositoryCommit has a transient reference to the JGit commit and reads the commit from the repository upon de-serialization. * RefModel is a similar case (JGit tags/branches may also have links to the commits they point to). Solved a bit differently by making it a pure data object by transferring the interesting data from the JGit object in the constructor. * Change DataViews instantiated with RevCommit to use RepositoryCommit instead. * Change inner anonymous DataViews to ensure they do not have a synthesized field referencing the "allRefs" map. Such a synthesized field would also get serialized, and then serialize JGit commits again. Finally, remove non-transient logger instances in Wicket classes. Those might lead to NotSerializableException. These StackOverflowErrors have been reported in several places since 2014: * https://groups.google.com/forum/#!topic/gitblit/GH1d8WSlR6Q * https://bugs.chromium.org/p/gerrit/issues/detail?id=3316 * https://groups.google.com/d/msg/repo-discuss/Kcl0JIGNiGk/0DjH4mO8hA8J * https://groups.google.com/d/msg/repo-discuss/0_P6A3fjTec/2kcpVPIUAQAJ * https://github.com/gitblit/gitblit/issues/1011 * https://github.com/tomaswolf/gerrit-gitblit-plugin/issues/21
* | Add test for loading russian propertiesFlorian Zschocke2021-11-032-0/+13
| |
* | Adding Russian Translate Добавлен русский языкVladimir A2021-11-035-0/+854
| |
* | raw: URL encode the links to raw view of filesFlorian Zschocke2021-10-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far links to raw view were not encoded. The browser did some encoding of spaces on its own, which the servlet would unescape, since it uses the `HttpServletRequest.getPathInfo` method. That decodes the path before returning it. A problem arises when a bracket is in the file (or folder) name. The brackets are the characters that are not allowed in the path, according to the `URI.parse` method. (Which is a bit harsh, because brackets actually are only reserved for the host part since IPv6.) That means that the decoding fails when a bracket character is encountered. This went unnoticed since the failed decoding will return the path as it got it. But once there is a space in the file name, which the browser helpfully encoded for us, the failed decoding will now leave the encoded space in there. And that will result in a path that does not exist, e.g. `file%20[a]`. To be on the safe side, we simply encode the path in the links that we generate, so that it complies with the rules that are used in `getPathInfo`. This fixes #1375.
* | TimeUtils: Change daysAgo to calculate difference in calendar daysFlorian Zschocke2021-10-242-1/+476
| | | | | | | | | | | | | | | | | | | | | | | | | | The `daysAgo` method seemed to want to normalize on a calendar day? I can't really tell what it was trying to do, but the problem is that it does not take into account any time shift due to time zones so it never really worked outside of GMT. So instead a new `calendarDaysAgo` method is added (because I am unsure on what the `daysAgo` method is trying to do. It can probably be removed). The new method cleanly calculates difference in calendar days because it normalizes the two given time stamps on the same time zone. The `timeAgo` method now used the new method. This fixes #1248.
* | TimeUtils: Move unit test to same package as TimeUtils isFlorian Zschocke2021-10-233-8/+10
| | | | | | | | | | | | | | | | | | | | For some reason the `TimeUtilsTest` class is, like almost all tests, in the `com.gitblit.tests` package. But this way all methods in classes which we might predominately need for tests have to be public. So move the unit test class `TimeUtilsTest` to the same package as the class it is testing, i.e. `com.gitblit.utils.TimeUtils`. This way we ca set the new added methods which get the current time passed in to be at least not public.
* | TimeUtils: Increase testability and add testsFlorian Zschocke2021-10-232-8/+189
| | | | | | | | | | | | | | | | | | Add tests for `timeAgo` to analyse issue #1248. The tests are dependent on when they run as they time functions use the current date and time. To make them testable in a reproducible way, we need the ability to pass in what we think is "now". So add overloaded methods that take a `now` parameter so that we can pass in the current time.
* | Merge pull request #1381 from edram/masterFlorian Zschocke2021-10-221-1/+9
|\ \ | | | | | | Fix mirrored http(s) with a username and password
| * | Fix mirrored http(s) with a username and passwordedram2021-10-221-1/+9
| | | | | | | | | | | | This fixes #1059
* | | Property bundle: Fix typo in "nl" language fileFlorian Zschocke2021-10-211-1/+1
| | |
* | | Property bundle: Fix various errors with escapesFlorian Zschocke2021-10-213-21/+21
| | | | | | | | | | | | | | | Double escaped backslashes, wrongly escaped unicode codes, broken escaped newlines.
* | | Property bundle: Fix incorrect property keysFlorian Zschocke2021-10-218-12/+10
| | | | | | | | | | | | | | | | | | | | | Some property keys had typos. There is a `gb.ticketStatus` and a `gb.ticketState`. Neither is used anywhere in the code, but only the former is defined in the default file. So only use `gb.ticketStatus`.
* | | Escape non-ASCII characters in the GitBlitWebApp_pt_BR.properties fileFlorian Zschocke2021-10-211-220/+219
| | | | | | | | | | | | If keeps acting up when trying to stage parts of it. I hope this fixes that.
* | | fix: Remove trailing spaces from property bundle filesFlorian Zschocke2021-10-2114-83/+83
| | |
* | | fix: Remove duplicate property keys from properties filesFlorian Zschocke2021-10-2114-27/+12
|/ / | | | | | | | | | | | | | | | | | | Some property keys were duplicated, mostly `status`, `permission` and `comment`. The problem with `gb.comment` is, that it is used in two different locations in two different meanings. One as a verb, the second as a noun. Which makes no difference in English, but other languages. The solution is that the second key is renamed to `gb.sshKeyComment`. The code is adjusted accordingly.
* | Add a unit test to check if the resource bundle can be loadedFlorian Zschocke2021-10-2015-6/+196
| | | | | | | | | | | | | | | | | | To prevent that we have a resource file in a resource bundle broken and not loading undiscovered for years, add a unit test that will load the resource properties file for each of the languages. In order to check if the file was loaded and the bundle mechanism didn't fall back on the default, a new property key is added to each language file, solely for the purpose to be checked in the unit test.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 19:07:29 +0000