summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
* | | Merge pull request #1427 from flaix/ssh-upateFlorian Zschocke2022-10-169-28/+53
|\ \ \ | |/ / |/| | Update SSHD to version 1.7.0 and add support for EdDSA user keys
| * | Update dependency MINA SSHD to version 1.7.0Florian Zschocke2022-10-095-9/+12
| | |
| * | upgrade to sshd 1.6.0, add eddsa dependency, upgrade jgit to 4.1.2ricardop2022-10-088-26/+48
|/ / | | | | | | | | | | | | | | | | (cherry picked from commit d8fbdda2ab3fa48e92bdf37399d4b75c48409c5c@rpardini:master) # Conflicts: # .classpath # build.moxie # src/test/java/com/gitblit/tests/SshUnitTest.java
* | Merge branch 'oddeirik-disable-client-certs' into masterFlorian Zschocke2022-08-143-7/+51
|\ \
| * | 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
| | |
* | | Merge branch 'felazuris-fixpermdisplay' into masterFlorian Zschocke2022-08-072-4/+59
|\ \ \ | | | | | | | | | | | | This pulls in the rebased branch from PR #1100.
| * | | 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
* | | Merge branch 'QuentinC-fix-tab-escape' into masterFlorian Zschocke2022-08-022-4/+40
|\ \ \ | | | | | | | | | | | | | | | | The contribution branch was rebased to current master. This should close #1065 as merged.
| * | | 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.
* | | Create SECURITY.mdFlorian Zschocke2022-06-201-0/+12
| | | | | | | | | This closes #1418
* | | doc: Merge release 1.9.3 info into releases.moxieFlorian Zschocke2022-04-091-4/+43
| | |
* | | ci: Add debug logging to nightly buildFlorian Zschocke2022-04-091-1/+3
| | | | | | | | | | | | | | | For some reason the secret gate doesn't work and the main Gitblit repo also attempts to deploy the nightly to Docker which must fail.
* | | 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.
| * | | Reset build identifiers for next point release cycleFlorian Zschocke2022-03-122-2/+20
| | | |
* | | | ide: Adjust IDE project files to javax.mail 1.5.6Florian Zschocke2022-02-063-6/+20
| | | |
* | | | Update javax.mail to 1.5.6paladox2022-02-061-1/+1
| | | |
* | | | Merge branch 'pr-1219' into masterFlorian Zschocke2022-02-066-31/+36
|\ \ \ \ | | | | | | | | | | | | | | | This merges rebased and enhanced pull request #1219
| * | | | ci: Remove Java 7 buildFlorian Zschocke2022-02-062-22/+24
| | | | |
| * | | | build: Comment out option used for Java 7Florian Zschocke2022-02-061-1/+1
| | | | |
| * | | | doc: Update documentation for new Java 8 minimumFlorian Zschocke2022-02-062-3/+6
| | | | |
| * | | | Update readme for new min java versionpaladox2022-02-061-1/+1
| | | | |
| * | | | Bump min java support to 1.8paladox2022-02-061-4/+4
|/ / / / | | | | | | | | Fixes #1218
* | | | ci: Transition to ICO image labelsFlorian Zschocke2022-02-061-0/+2
| | | |
* | | | ci: Allow to force build a nightly versionFlorian Zschocke2022-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable a switch for manual workflow triggering that overrides the check if a new commits were made since the last build. If the input is set to 'true', a new build is run even when no new commits are present. This is mainly so that changes to the gitblit-docker repo can be included in builds. This could also be automated in the workflow, if need be.
* | | | ci: Test nightly docker image with Goss before pushing to registryFlorian Zschocke2022-02-061-0/+53
| | | |
* | | | ci: Add workflow for a nightly build of docker imageFlorian Zschocke2022-02-061-0/+180
| | | |
* | | | Readme: Fix link to nightly docker imageFlorian Zschocke2022-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The link to the nightly docker images points to the actual image layer, which is removed when a new nightly is pushed. Instead, we should point to the images page, filtering on the tag 'nightly'.
* | | | Reset build identifiers for next minor release cycleFlorian Zschocke2022-02-052-2/+20
|/ / /
* | | Prepare 1.9.2 releasev1.9.2flaix2022-02-052-10/+10
| | |
* | | site: Fix awful HTML indentationFlorian Zschocke2022-02-031-18/+18
| | |
* | | site: Old packages moved from Bintray to CloudsmithFlorian Zschocke2022-02-032-2/+3
| | | | | | | | | | | | | | | | | | | | | 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.
* | | build: Determine release version with simple grepFlorian Zschocke2022-02-011-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | To determine what the release version is to be, use a simple grep over the moxie.build file and cut off the `-SNAPSHOT` part. The moxie tag command doesn't do anything else, either. But the problem is that when using the moxie tag command on the release branch, where the version has already been set to a release version, it would create a second release version, like so: 1.9.2-1.
* | | build: Allow for updating an existing draft releaseFlorian Zschocke2022-02-012-30/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a release draft and uploading assets, provision for the case that a draft release already exists. In that case, instead of creating a release, the existing release (changelog) is edited and the assets are deleted before the new built ones are uploaded. This commit also introduces the `${gh.repo}` property in build.xml, so that the Github project could be chosen dynamically. Not really needed, to be honest, but, yeah, whatever.
* | | build: Add target to determine and report release versionFlorian Zschocke2022-02-011-2/+30
| | |
* | | Build: create macro for creating the release process scriptFlorian Zschocke2022-02-011-27/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the creation of the release process script, from `release.template` into a `macrodef`. Add a new target `releaseScript`, so that the release script can be created after the `tagRelease` target was run. This is helpful if the `tagRelease` target is run by a different, earlier process than the actual release creation process.
* | | doc: Update release notesFlorian Zschocke2022-02-011-1/+4
| | |