summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add Czech localeJan Breuer2017-02-155-0/+854
|/ / /
* | | Merge pull request #1192 from mystygage/listBranchForRepositoryJames Moger2017-02-082-1/+6
|\ \ \ | | | | | | | | List branches from only one repository if a repository name is given
| * | | List branches from only one repository if a repository name is givenMarkus Fömpe2017-01-262-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | e.g.: https://localhost:8443/rpc/?req=LIST_REPOSITORY_BRANCHES&name=repo.git Fix #1184
* | | | Merge pull request #1198 from WilliamFromTW/masterJames Moger2017-02-0812-41/+239
|\ \ \ \ | | | | | | | | | | New Setting "Default Language" when creating user
| * | | | New Setting "Default Language" when creating user.william2017-02-084-29/+71
| | | | |
| * | | | fix bug "get user default language null exception"william2017-01-251-1/+5
| | | | |
| * | | | Sending email (certificate zip file) based on locale that user selectedwilliam2017-01-248-12/+164
| |/ / /
* | | | Merge pull request #1187 from gitblit/revert-1186-listBranchForRepositoryJames Moger2017-01-253-15/+1
|\ \ \ \ | | | | | | | | | | Revert "New rpc endpoint for listing all branches from a given repository"
| * | | | Revert "New rpc endpoint for listing all branches from a given repository"James Moger2017-01-253-15/+1
|/ / / /
* | | | Merge pull request #1186 from mystygage/listBranchForRepositoryJames Moger2017-01-253-1/+15
|\ \ \ \ | |/ / / |/| | | New rpc endpoint for listing all branches from a given repository
| * | | New rpc endpoint for listing all branches from a given repositoryMarkus Fömpe2017-01-253-1/+15
|/ / /
* | | Merge pull request #1183 from RainerW/fixApacheProxySampleJames Moger2017-01-231-0/+1
|\ \ \ | | | | | | | | Documentation update : "behind apache" also edit "Ajax-Location" header
| * | | when apache terminates https, the Ajax-Location header needs to be rewritten ↵RainerW2017-01-231-0/+1
|/ / / | | | | | | | | | as well
* | | Merge pull request #6 from fzs/sshAuthMethodsFlorian Zschocke2017-01-212-9/+52
|\ \ \ | | | | | | | | Set list of offered SSH authentication methods.
| * | | Set list of offered SSH authentication methods.merged--sshAuthMethodsFlorian Zschocke2016-12-062-9/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the SSH authentication methods used by the server configurable, so that for example password authentication can be turned off. For this, a `git.sshAuthenticationMethods` setting is added which is a space separated list of authentication method names. Only the methods listed will be enabled in the server. This is modeled after the option of the same name from sshd_config, but it does not offer listing multiple required methods. It leaves the door open, though, for a later extension to support such a multi-factor authentication. Since this also includes Kerberos authentication with GSS API, this obsoletes the `git.sshWithKrb5` property. The latter is removed. Instead, to enable Kerberos5 authentication, add the method name `gssapi-with-mic` to the authentication methods list.
* | | | Merge pull request #1178 from srbala/patch-1Florian Zschocke2017-01-162-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | Update declaration to Servlet 3.0 in web.xml and weblogic.xml. Fixes #1132
| * | | | Update weblogic.xmlBala Raman2017-01-161-2/+2
| | | | | | | | | | | | | | | Update to web app 3.0 xsd
| * | | | Update to web.xml, fix to #1132Bala Raman2017-01-151-4/+4
|/ / / / | | | | | | | | | | | | | | | | Update to web.xml, fix to #1132 Fixes to namespace to fix xml parse error, where strict validation required
* | | | Merge pull request #1171 from pingunaut/usermanager-file-instantiationJames Moger2017-01-062-2/+25
|\ \ \ \ | | | | | | | | | | Update UserManager to support construction of IUserServices with IRuntimeManager as a constructor parameter
| * | | | extracted methodMartin Spielmann2017-01-061-9/+20
| | | | |
| * | | | updated commentde4c9d2016-12-301-1/+1
| | | | |
| * | | | update user manager to support instantiation if IUserService with ↵de4c9d2016-12-302-2/+14
| | |/ / | |/| | | | | | | | | | IRuntimeManager as a parameter
* | | | Merge pull request #1176 from ds5apn/masterJames Moger2017-01-051-718/+759
|\ \ \ \ | | | | | | | | | | Update korean translation for gitblit new version.
| * | | | Update korean translation for gitblit new version.DONGSU, KIM2017-01-051-718/+759
|/ / / /
* | | | Increase minor version number to 9Florian Zschocke2017-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | Bump version to 1.9.0-SNAPSHOT, increasing the minor as the next release includes interface changes.
* | | | Merge branch 'ci', enabling CI services.Florian Zschocke2017-01-022-0/+24
|\ \ \ \
| * | | | Add build definition file for Circle CIFlorian Zschocke2017-01-021-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure the build for Circle CI in the new file circle.yml. Specify a compile step to have the build fail on compilation error. The test step is then configured as `ant test`, which will compile again due to the limits of Ant/Moxie. Contrary to the documentation, the default Java version on Circle CI is Java 8. The project is set as a Java 7 project. We define to use OpenJDK 7, because the Gitblit build has some trouble with Java 8, I consider Java 7 the default, and Circle CI does not provide an Oracle JDK 7 installation to use. I could only get it to work with OpenJDK 7. The Java version is reported in the Circle CI build script to ease analysis. Test and coverage reports get stored as artifacts for a build, which allows to browse them in the Circle CI web interface.
| * | | | Add definition file for Travis CIFlorian Zschocke2017-01-021-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add the most basic build definition file for Travis CI. It only defines the project language as Java. For the rest the defaults are kept as Travis seems to work fine with them. We add `.travis.yml` as a dotfile in order not to clutter the top directory with too much non-project files.
* | | | Update to explicit versions of JUnit 4.12 and JaCoCo 0.7.8Florian Zschocke2016-12-213-6/+6
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use explicit coordinates, and therefor version numbers fro JUnit in the build.moxie file. It should not be some version that just happens to be used. Update JUnit to latest 4.12. Update JaCoCo to lates 0.7.8, which makes it work under Java 8. The last used version would fail when tests are run under Java 8.
* | | Add test resources path `src/test/resources` to project configurationFlorian Zschocke2016-12-193-0/+3
| | |
* | | Fix typo in defaults.properties.Florian Zschocke2016-12-181-1/+1
| | |
* | | Merge pull request #1160 from fzs/sshLdapAuthenticatorFlorian Zschocke2016-12-1814-625/+2276
|\ \ \ | | | | | | | | LDAP SSH key manager
| * | | Extend documentation in default.properties and LdapKeyManager.java.merged--sshLdapAuthenticatorFlorian Zschocke2016-12-062-2/+31
| | | |
| * | | The public key manager can disable writing keys, which hides commandsFlorian Zschocke2016-12-066-12/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some public key mangers may be read-only, i.e. not allow to add or delete keys, or to change the key comment or assigned permissions. In such a case the respective commands should not be available on the SSH shell and the SSH Keys panel should also not offer the possibility. The `IPublicKeyManager` gets three new methods, modelled after the `AuthenticationManager`: `supportsWritingKeys`, `supportsCommentChanges` and `supportsPermissionChanges`. They return true if a key manager allows for keys to be written or updated. For example the existing `FileKeyManager` will return true for all three since it allows to store and update keys in a file. The new `LdapKeyManager` returns false since it only accesses LDAP and can not add or update any keys in the directory. A future key manager might get keys from an LDAP directory but still keep comments and permissions for it in a local copy. If writing of keys is not supported: * the welcome shell does not suggest adding a key, * the `SshKeysDispatcher` does not offer the "add", "remove", "comment" and "permission" commands, and * the SSH keys panel hides the "delete" button in the key list, and the "Add Key" form. The hiding of the "Add key" form is not perfect since the surrounding div is still shown, but I don't know how to hide it and it didn't look too bad, either.
| * | | Fix SshKeysDispatcher test failing on WindowsFlorian Zschocke2016-12-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `SshKeysDispatcher` tests that use the keys list command are failing on Windows because they assume a Unix line ending after each key. But the command will use a system line ending. So this fix uses system line endings in the reference string for the assert, too. In addition, two `assertTrue(false)´ are replaced with a proper `fail`.
| * | | Use dynamic port selection for LDAP listeners in LDAP tests.Florian Zschocke2016-12-061-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using fixed ports for the listeners of the in-memory LDAP server, let the listeners select ports and then save them in the authentication mode instance. This way we prevent port collisions, which especially showed up under Windows.
| * | | Retrieve public SSH keys from LDAP.Florian Zschocke2016-11-296-37/+1248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new class `LdapPublicKeyManager` which retrieves public SSH keys from LDAP. The attribute can be configured with the new configuration option `realm.ldap.sshPublicKey`. The setting can be a simple attribute name, like `sshPublicKey`, or an attribute name and a prefix for the value, like `altSecurityIdentities:SshKey`, in which case attributes are selected that have the name `altSecurityIdentities` and whose values start with `SshKey:`.
| * | | Extract LdapConnection into new class from LdapAuthProviderFlorian Zschocke2016-11-233-268/+543
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract the inner class `LdapConnection` from the `LdapAuthProvider` into a separate class, so that it can be used from multiple classes that have to connect to an LDAP directory. The new class is placed into the new package `com.gitblit.ldap`, since it isn't specific to authentication.
| * | | Create base unit test class for LDAP tests.Florian Zschocke2016-11-232-332/+416
| | | | | | | | | | | | | | | | | | | | | | | | Extract the creation of the in-memory servers and the interceptor code to a base class that LDAP related unit tests can extend to have the servers available.
* | | | Remove duplicate import of class SecureRandomFlorian Zschocke2016-12-151-1/+0
| | | | | | | | | | | | | | | | | | | | Fixes the build that was broken by cherry-picking commit 2be2c2, which resulted in an import collision on the `SecureRandom` class.
* | | | Merge pull request #1167 from fzs/secureCookiesJames Moger2016-12-142-1/+16
|\ \ \ \ | | | | | | | | | | Secure cookies
| * | | | Set secure session cookies when redirecting from HTTP to HTTPS.merged--secureCookiesFlorian Zschocke2016-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far for session cookies the secure property was only set when no HTTP port was opened. This changes to also set it when HTTP is redirected to the HTTPS port.
| * | | | Set secure user cookies and only for HTTP.Florian Zschocke2016-12-101-0/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark the user authentication cookie to be only used for HTTP, making it inaccessible for JavaScript engines. If only HTTPS is used and no HTTP (i.e. also if HTTP is redirected to HTTPS) then mark the user cookie to be sent only over secure connections.
* | | | Merge branch 'rcaa-master' into master.Florian Zschocke2016-12-1313-12/+136
|\ \ \ \
| * | | | Introduce SecureRandom wrapper for properly seeded static instancesFlorian Zschocke2016-12-123-5/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce our own wrapper `SecureRandom` around `java.security.SecureRandom`. This a) makes sure that the PRNG is seeded on creation and not when random bytes are retrieved, and b) uses a static instance in the `UserModel` so that lags do not occur during operation due to potentially seeding getting blocked on Unix when reading from the system's entropy pool. To keep the random data still secure, the static instance will reseed all 24 hours, also a functionality of the wrapper class. This fixes #1063 and extends and closes PR #1116
| * | | | changing Math.random to SecureRandomrcaa2016-12-111-1/+5
| | | | |
| * | | | removing unecessary user cookie codeRodrigo Andrade2016-08-157-8/+8
| | | | |
| * | | | removing duplicated code for cookie genaration and adding random bytes to ↵Rodrigo Andrade2016-08-155-4/+8
| | | | | | | | | | | | | | | | | | | | generate user cookies
* | | | | Merge branch 'fixMentionsInTickets-985'Florian Zschocke2016-12-125-7/+88
|\ \ \ \ \
| * | | | | Fix user mention regular expression and group replacement.merged--fixMentionsInTickets-985Florian Zschocke2016-12-105-5/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regular expression used for user mentions used to work only inside sentences. Also, since it tested for whitespace, the whitespace would get replaced, too, which would join lines together. Instead the new regex uses boundary matchers to match against word boundaires. As these are not capturing only the actual user mention can be captured and is then replaced. Also, this way the regex can ignore punctuation like in "@jim, look at this." Since Gibtlit now requires Java 7 we can use named capture groups. This makes the use of a centrally defined regular expression much safer. The (admittedly only) group to capture the user name is named "user" and can be referenced by this name. By using the name instead of a group number, the regex could be changed without the code using it breaking because the group number changed. A simple test is added for user mentions, which unfortunately has to deal with the full markdown replacement, too. Fixes #985
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-02 18:18:32 +0000