summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove workaround for JGit crashing on 'utf-9' etcFlorian Zschocke2022-11-112-159/+0
| | | | | | | | | | | | | | | | | | | | | Updating JGit fixed the issue that a commit in a repo with an unknown character set throws an exception. This would crash the RepositoryManager. The extra handling, which patches JGit classes during runtime is completely removed.
| * | Add wrapper class to return a default encodingJan Vanhercke2022-11-092-2/+145
|/ / | | | | | | | | Unknown encodings may cause gitblit to fail to start. This modification injects a wrapper class in the JGit internal to fake a valid return value.
* | ci: Delete nightly build artefact after testing the containerFlorian Zschocke2022-11-071-7/+7
| | | | | | | | | | | | Leave the artefact until after the container has been built and tested. In case the test fails the artefact can be still downloaded to analyse what might have caused the container build or test to fail.
* | Update Bugtraq to v0.4Florian Zschocke2022-11-075-21/+146
| | | | | | | | Sync with upstream @ https://github.com/mstrap/bugtraq
* | Merge branch 'pr-1214' into masterFlorian Zschocke2022-11-063-13/+13
|\ \ | | | | | | | | | | | | Fix conflict from earlier JGit update to 4.5 Add updated Eclipse and IntelliJ files.
| * | Fix jgit version to one that is found in Maven CentralFlorian Zschocke2022-11-061-1/+1
| | |
| * | Update jgit to 4.6.1.201703071140-r.123-g5094c1a5cpaladox2017-03-181-1/+1
| | |
| * | Update jgit to 4.5.0.201609210915-rpaladox2017-03-181-1/+1
| | |
| * | Update jgit to 4.6.1.201703071140-r.123-g5094c1a5cpaladox2017-03-181-1/+1
| | |
* | | Merge branch 'pr-1213' into masterFlorian Zschocke2022-11-063-6/+110
|\ \ \ | | | | | | | | | | | | | | | | Fix conflict in updated slf4j version. Add updated Eclipse and IntelliJ files.
| * | | Add missing jetty-xml dependency.Florian Zschocke2022-11-061-0/+1
| | | |
| * | | Fix compiling jetty 9.3paladox2017-03-181-1/+8
| | | | | | | | | | | | jetty-all was converted to a uber jar and not a jar. So it was failing to resolve.
| * | | Update jetty to 9.3.16.v20170120paladox2017-03-181-1/+1
| |/ /
* | | Merge branch 'sshkey_form_feedback' into masterFlorian Zschocke2022-11-014-1/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back in a change that was implemented in a pull request from 2017, but got lost in the chaos of multiple pull requests from intermingling branches. This does not only provide feedback when a SSH key cannot be parsed, but it also does so in a way that the warning goes away when a correct key is added. Admittedly, I have no idea how to properly do this with a Wicket FeedbackMessage, all I could find on Google was highly complicated. Not only does this bring back (or really in) the fix for issue #1226, but it also fixes #984.
| * | | Replace key feedback with label instead of FeedbackMessageFlorian Zschocke2022-11-013-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Since it is a pest to get rid of a Wicket FeedbackMessage in an AJAX target, change the code to use an extra label that can provide feedback if the key could not be parsed or was empty.
| * | | Add feedback to SSH Key Form. #1226Martin Spielmann2022-11-014-1/+9
|/ / / | | | | | | | | | | | | if key is empty of can not be parsed, form did provide any feedback to user before
* | | Fix paths after update of checkout actionFlorian Zschocke2022-11-011-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Github 'checkout' action was updated from v1 to v3. But the behaviour changed between the two which broke this workflow. The old action would clone other repositories not into the workspace but parallel to the workspace. The new version does every clone/checkout relative to the workspace. That means that where previously the gitblit-docker repository would be cloned in parallel to the workspace which is gitblit/gitblit, it is now cloned into the gitblit/gitblit directory path. So remove all the references to `../gitblit-docker`. The files are in the current directory now.
* | | Merge pull request #1435 from flaix/fix-authority-npFlorian Zschocke2022-11-012-2/+7
|\ \ \ | | | | | | | | Fix crash in Gitblit Authority for deleted users
| * | | authority: Fix null pointer crash for deleted usersFlorian Zschocke2022-11-012-2/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user had a certificate, i.e. an entry in the Gitblit Authority database, but the user was deleted from the Gitblit database, then the Authority application crashes upon loading. This patch prevents the crash. The deleted user is no longer shown in the Authority. But the database entry still is kept. This should be improved to show deleted users and give the possibility to delete them from the Authority's database. This fixes #1359
* | | Merge pull request #1434 from flaix/update-guiceFlorian Zschocke2022-10-314-15/+99
|\ \ \ | | | | | | | | Update Guice version to 5.1.0
| * | | deps: Update Guice version to 5.1.0Florian Zschocke2022-10-314-15/+99
|/ / / | | | | | | | | | | | | | | | | | | | | | Update Guice to 5.1.0. This version is compatible with Java 17. The gitblit patch of the servlet extension was ported to Guice 5.1.0, too. The update of Guice requires an update of the Guava version, too. Thus Guava is updated to 27.0.1-jar.
* | | Merge pull request #1433 from flaix/np-fixFlorian Zschocke2022-10-311-0/+3
|\ \ \ | | | | | | | | Fix null pointer exception in FileSettings
| * | | fix: Fix null pointer exception in FileSettingsFlorian Zschocke2022-10-311-0/+3
|/ / / | | | | | | | | | | | | Fix a null pointer access in the `toString` method for a freshly created `FileSettings`.
* | | Merge pull request #1430 from flaix/update-actionsFlorian Zschocke2022-10-282-16/+19
|\ \ \ | | | | | | | | Update workflows due to deprecations in actions
| * | | ci: Replace set-output command with echo to GITHUB_OUTPUTFlorian Zschocke2022-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | The `set-output` command was deprecated. The new way to set an output parameter for a step is to echo to the file stored in `$GITHUB_OUTPUT`
| * | | ci: Update action versions in nightly build workflowFlorian Zschocke2022-10-271-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions are updated for various actions that have a new version which uses NodeJS 16. One action has no updated version available yet: `e1himself/goss-installation-action` But an issue exists mentioning that it needs an update.
| * | | ci: Update action versions in push build workflowFlorian Zschocke2022-10-271-4/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workflow runs started issuing warnings because NodeJS 12 was deprecated. Actions need to get updated to newer versions that use NodeJS 16. This commit updates the `actions/checkout` and the `actions/setup-java` actions to the latest version in the workflow that builds on every push. The new setup-java action requires the distribution to be specified, since multiple JDK distributions are supported now. We chose Eclipse's Temurin here which is the successor to AdoptOpenJDK, which we use for development.
* | | ci: Build pull requests, tooFlorian Zschocke2022-10-271-1/+5
| | | | | | | | | | | | Build pull requests, just like we build on every push.
* | | Merge pull request #1429 from flaix/ssh-host-algsFlorian Zschocke2022-10-257-84/+333
|\ \ \ | | | | | | | | Add new SSH host key types
| * | | Skip SSH host key files that do not existFlorian Zschocke2022-10-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now do not generate a DSA host key file anymore, but keep it in the list of potential keys so that existing keys still work, it can happen that the files for DSA (and Ed25519) are getting loaded but they do not exist. This results in an error in the log. So instead check if the file exists and only try to load files that exist. This prevents from errors (which are none) being spammed in the log.
| * | | Add SSH host keys with ECDSA and Ed25519Florian Zschocke2022-10-253-14/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create new host keys, one with ECDSA and one with Ed25519 algorithms. For the Ed25519 currently the EdDSA library from i2p is used. This requires some quirks, compared to a modern BouncyCastle. But the SSHD library used cannot use BouncyCastle yet for Ed25519. No DSA key is generated anymore, but we still support existing ones.
| * | | format: Cleanup formatting and whitespacesFlorian Zschocke2022-10-251-23/+41
| | | |
| * | | Update BouncyCastle to version 1.69Florian Zschocke2022-10-256-53/+43
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-11 13:49:15 +0000