aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* PushCertificateStore: Return boolean from batch save methodsDave Borowitz2015-07-152-3/+9
| | | | Change-Id: I9730cb4f60c60ee6d5a7a156a0b6a53f79309ec3
* Allow saving push certs on a subset of refsDave Borowitz2015-07-152-6/+91
| | | | | | | | | | | | | | | | Consider a BatchRefUpdate produced by Gerrit Code Review, where the original command pushed over the wire might refer to "refs/for/master", but that command is ignored and replaced with some additional commands like creating "refs/changes/34/1234/1". We do not want to store the cert in "refs/for/master@{cert}", since that may lead someone looking to the ref to the incorrect conclusion that that ref exists. Add a separate put method that takes a collection of commands, and only stores certs on those refs that have a matching command in the cert. Change-Id: I4661bfe2ead28a2883b33a4e3dfe579b3157d68a
* Update org.apache.httpcomponentsMatthias Sohn2015-07-146-24/+24
| | | | | | | | | | | - update org.apache.httpcomponents.httpcore to 4.3.3 - update org.apache.httpcomponents.httpclient to 4.3.6, 4.3.5 and later are reported to fix vulnerability CVE-2014-3577 CQ: 9220 CQ: 9221 Bug: 470523 Change-Id: I39b80b250c6c1daede6a23e9f177fb2988ac37bb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Access static member LocalDiskRepositoryTestCase.CONTENT directlyMatthias Sohn2015-07-141-6/+7
| | | | | | | | 37a1e4be moved this constant causing the following error message in Eclipse: "The static field LocalDiskRepositoryTestCase.CONTENT should be accessed directly". Change-Id: I4ceb57a30f2e5a8f7e55109ef260a244ed5e7044 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* PushCertificateStore: Add method to save in batchDave Borowitz2015-07-132-13/+79
| | | | Change-Id: I8bfaee1a52d368ffe2cd7e8af1754a5261569078
* Fixed @since tags on new APIAndrey Loskutov2015-07-122-2/+4
| | | | | Change-Id: I77bc2ec486ffe4c8b864663d103d8cf39c3f35e1 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* Store push certificates in refs/meta/push-certsDave Borowitz2015-07-104-0/+753
| | | | | | | | | | | | | | | | | | | | | | | | | Inspired by a proposal from gitolite[1], where we store a file in a tree for each ref name, and the contents of the file is the latest push cert to affect that ref. The main modification from that proposal (other than lacking the out-of-git batching) is to append "@{cert}" to filenames, which allows storing certificates for both refs/foo and refs/foo/bar. Those refnames cannot coexist at the same time in a repository, but we do not want to discard the push certificate responsible for deleting the ref, which we would have to do if refs/foo in the push cert tree changed from a tree to a blob. The "@{cert}" syntax is at least somewhat consistent with gitrevisions(7) wherein @{...} describe operators on ref names. As we cannot (currently) atomically update the push cert ref with the refs that were updated, this operation is inherently racy. Kick the can down the road by pushing this burden on callers. [1] https://github.com/sitaramc/gitolite/blob/cf062b8bb6b21a52f7c5002d33fbc950762c1aa7/contrib/hooks/repo-specific/save-push-signatures Change-Id: Id3eb32416f969fba4b5e4d9c4b47053c564b0ccd
* Add setTargetBranch in RepoCommand.Yuxuan 'fishy' Wang2015-07-102-44/+86
| | | | | | | | This will allow us to write the super project in a branch other than master. Change-Id: I578ed9ecbc6423416239e31ad644531dae9fb5c3 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* Move `RepositoryTestCase.indexState` to parent classChris Price2015-07-102-106/+100
| | | | | | | | | | | | | | | The test helper method `indexState` in `RepositoryTestCase` is very useful for writing tests, even in cases where we need to do things like create more than one repository for a test and thus we don't want to use the built-in `db` member variable that exists in `RepositoryTestCase`. Since the method is static, we can move it up to the parent class `LocalDiskRepositoryTestCase`, where it can be used by tests that aren't a great fit for inheriting directly from `RepositoryTestCase`. Bug: 436200 Change-Id: I2b6de75c001d2d77ddb607488af246548784a67f Signed-off-by: Chris Price <chris@puppetlabs.com>
* Change `indexState` to static methodChris Price2015-07-101-1/+1
| | | | | | | | | The `indexState` method is no longer referring to any member variables from the class, so it can be made static. Bug: 436200 Change-Id: I013316de5c373417ea758ca6e17da29209fead53 Signed-off-by: Chris Price <chris@puppetlabs.com>
* Merge "Use local variable in RepositoryTestCase.indexState"Christian Halstrick2015-07-091-1/+1
|\
| * Use local variable in RepositoryTestCase.indexStateChris Price2015-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a signature of the test helper method `indexState`, in `RepositoryTestCase`, that accepts a `Repository` object as an argument. However, there was one line of code where this variable was not being used, and the method was instead referring to a member variable `db`. I believe this was probably just an oversight in a previous refactor, and that the correct behavior is to use the variable from the argument list. This change also has the benefit of making it possible to convert this method to a static method, since it no longer relies on any state from the class. Bug: 436200 Change-Id: Iac95b046dc5bd0b3756642e241c3637f1fad3609 Signed-off-by: Chris Price <chris@puppetlabs.com>
* | PushCertificateParser: Move reader parsing to instance methodDave Borowitz2015-07-091-17/+35
| | | | | | | | Change-Id: I8ab5fb97303e25b28187375b6f9ff28f918bdd43
* | PushCertificateParser: Make constructor publicDave Borowitz2015-07-091-1/+7
| | | | | | | | | | | | | | | | Primarily to aid in writing end-to-end tests, which must be written outside this package as we don't currently have a Bouncy Castle dependency. Change-Id: Ia24179773140d9ecc616b3a6b2e630c85d800157
* | Report PackProtocolExceptions to client during receive-packDave Borowitz2015-07-093-48/+54
| | | | | | | | | | | | | | We have done this since forever with the "wanted old new ref" error, so let's do it for other such errors thrown in the same block as well. Change-Id: Ib3b1c7f05e31a5b3e40e85eb07b16736920a033b
* | PushCertificate: implement hashCode/equals/toStringDave Borowitz2015-07-091-0/+42
| | | | | | | | Change-Id: Ib588a3f47492cee5e5e6274a3b088678919a0fa0
* | PushCertificateParser: Make pushee optionalDave Borowitz2015-07-093-7/+32
| | | | | | | | | | | | | | | | When pushing to an HTTP server using the C git client, I observed a certificate lacking a pushee field. Handle this gracefully in the parser. Change-Id: I7f3c5fa78f2e35172a93180036e679687415cac4
* | PushCertificateParser: Change error string for invalid fieldDave Borowitz2015-07-091-1/+1
| | | | | | | | | | | | | | The old one didn't take an argument; the new one includes the field name. Change-Id: I175dc75dcdd05ba6fdec315c04c79550cfdc2342
* | PushCertificateParser: Add method for parsing from a streamDave Borowitz2015-07-092-23/+200
| | | | | | | | | | | | | | | | | | We intend to store received push certificates somewhere, like a particular ref in the repository in question. For reading data back out, it will be useful to read push certificates (without pkt-line framing) in a streaming fashion. Change-Id: I70de313b1ae463407b69505caee63e8f4e057ed4
* | IO: Add a method for reading linesDave Borowitz2015-07-082-0/+185
| | | | | | | | Change-Id: Ib7be76aa7ac889354ad4782e2b64d4221a0e25b9
* | BaseReceivePack: Treat all LFs as optionalDave Borowitz2015-07-075-71/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion on the git mailing list has concluded[1] that the intended behavior for all (non-sideband) portions of the receive-pack protocol is for trailing LFs in pkt-lines to be optional. Go back to using PacketLineIn#readString() everywhere. For push certificates specifically, we agreed that the payload signed by the client is always concatenated with LFs even though the client MAY omit LFs when framing the certificate for the wire. This is still reflected in the implementation of PushCertificate#toText(). [1] http://thread.gmane.org/gmane.comp.version-control.git/273175/focus=273412 Change-Id: I817231c4d4defececb8722142fea18ff42e06e44
* | BaseReceivePack: More validation during parseCommandDave Borowitz2015-07-074-25/+65
| | | | | | | | Change-Id: I25f3a5582a45dd0ec8f78f5daf74c2203797a184
* | Fix non-escaped quotes in JGitText.propertiesMatthias Sohn2015-07-071-8/+8
| | | | | | | | | | | | | | | | In most texts we use "cannot" hence instead of escaping the apostroph in "can't" use "cannot". Bug: 471796 Change-Id: Icda5b4db38076789d06498428909306aef3cb68b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Throw InvalidObjectIdException from ObjectId.fromString("tooshort")Jonathan Nieder2015-07-063-5/+29
| | | | | | | | | | | | | | | | | | | | | | ObjectId.fromString already throws InvalidObjectIdException for most malformed object ids, but for this kind it previously threw IllegalArgumentException. Since InvalidObjectIdException is a child of IllegalArgumentException, callers that catch IllegalArgumentException will continue to work. Change-Id: I24e1422d51607c86a1cb816a495703279e461f01 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | Avoid double-colon in InvalidObjectIdException descriptionJonathan Nieder2015-07-063-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invalidId message in JGitText and the asAscii bad id both contain a colon, so the resulting message would say Invalid id: : a78987c98798ufa Fix it by keeping the colon in the translated message and not adding another colon programmatically. Noticed by code inspection. Change-Id: I13972eebde27a4128828e6c64517666f0ba6288b Signed-off-by: Jonathan Nieder <jrn@google.com>
* | Compare API against 4.0.0.201506090130-rMatthias Sohn2015-06-241-1/+1
| | | | | | | | | | Change-Id: I7cb7e89875b5238a54411b8c43c298d4cbe9f7ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-4.0'Matthias Sohn2015-06-242-20/+81
|\ \ | | | | | | | | | Change-Id: I5c965206ad10bababe366a51ab7c33a8836a7868 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare 4.0.2-SNAPSHOT buildsMatthias Sohn2015-06-2446-248/+248
| | | | | | | | | | | | | | | Change-Id: I645cacfdde21aa28aa2e17c10dec0576b170ed0e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v4.0.1.201506240215-rv4.0.1.201506240215-rMatthias Sohn2015-06-2446-49/+49
| | | | | | | | | | | | | | | Change-Id: Ib7713b657e7812b0debd72bb4eece0daa187e80d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Add a grace period for packfiles during GCChristian Halstrick2015-06-222-20/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | For loose objects an expiration date can be set which will save too young objects from being deleted. Add the same for packfiles. Packfiles which are too young are not deleted. Bug: 468024 Change-Id: I3956411d19b47aaadc215dab360d57fa6c24635e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | API to remove repositories from RepositoryCacheTobias Oberlies2015-06-232-0/+56
| |/ |/| | | | | | | | | | | | | | | Add methods that allow to unregister repositories from the RepositoryCache individually. Bug: 470234 Change-Id: Ib918a634d829c9898072ae7bdeb22b099a32b1c9 Signed-off-by: Tobias Oberlies <tobias.oberlies@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | SignedPushConfig: Allow setting a custom nonce generator implDave Borowitz2015-06-182-8/+44
| | | | | | | | Change-Id: Ic0156a7d65d99881ef27801fcce7754594c436f0
* | PackCertificateParser: return null if nothing was receivedDave Borowitz2015-06-183-32/+105
| | | | | | | | | | | | Add test for this case in both the enabled and disabled cases. Change-Id: If9d12192a2dc9f9dd1eac9844b5a7b0edadc0b34
* | Include push certificates in RefUpdateDave Borowitz2015-06-183-0/+62
| | | | | | | | | | | | | | This may be used by e.g. a custom reflog implementation to record this information along with the ref update. Change-Id: I44adbfad704b76f9c1beced6e1ce82eaf71410d2
* | Remove redundant @since tags in new signed push classesDave Borowitz2015-06-182-34/+6
| | | | | | | | Change-Id: I9f57318a59f668906b80f67230d36ba6439fc7b4
* | Add a separate type for the identity in a push certificateDave Borowitz2015-06-186-47/+570
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These differ subtly from a PersonIdent, because they can contain anything that is a valid User ID passed to gpg --local-user. Upstream git push --signed will just take the configuration value from user.signingkey and pass that verbatim in both --local-user and the pusher field of the certificate. This does not necessarily contain an email address, which means the parsing implementation ends up being substantially different from RawParseUtils.parsePersonIdent. Nonetheless, we try hard to match PersonIdent behavior in questionable cases. Change-Id: I37714ce7372ccf554b24ddbff56aa61f0b19cbae
* | PushCertificateParser: include begin/end lines in signatureDave Borowitz2015-06-183-7/+12
| | | | | | | | | | | | | | | | The signature is intended to be passed to a verification library such as Bouncy Castle, which expects these lines to be present in order to parse the signature. Change-Id: I22097bead2746da5fc53419f79761cafd5c31c3b
* | PushCertificateParser: throw PackProtocolException in more casesDave Borowitz2015-06-181-7/+9
| | | | | | | | | | | | | | | | | | This is the subclass of IOException already thrown by BaseReceivePack#recvCommands when encountering an invalid value on the wire. That's what PushCertificateParser is doing too, so use the same subclass. Change-Id: I1d323909ffe70757ea56e511556080695b1a0c11
* | Extract a class for signed push configurationDave Borowitz2015-06-184-20/+166
| | | | | | | | | | | | | | | | | | The default behavior is to read a repository's signed push configuration from that repo's config file, but this is not very flexible when it comes to managing groups of repositories (e.g. with Gerrit). Allow callers to override the configuration using a POJO. Change-Id: Ib8f33e75daa0b2fbd000a2c4558c01c014ab1ce5
* | BaseReceivePack: fix reading cert lines in command loopDave Borowitz2015-06-181-4/+8
| | | | | | | | | | | | | | | | | | | | | | Add a missing continues to prevent falling through to the command parsing section. The first continue happens when the command list is empty, so change the condition to see whether we have read the first line, rather than any commands. Fix comparison to BEGIN_SIGNATURE to use raw line with newline. Change-Id: If3d92f5ceade8ba7605847a4b2bc55ff17d119ac
* | Silence API warnings introduced by a85e817dMatthias Sohn2015-06-172-2/+29
| | | | | | | | | | | | | | | | | | | | | | a85e817d is a slightly breaking API change to classes that were technically public and technically released in 4.0. However, it is highly unlikely that people were actually depending on public behavior, since there were no public methods to create PushCertificates with anything other than null field values, or a PushCertificateParser that did anything other than infinite loop or throw exceptions when reading. Change-Id: I1d0ba9ea0a347e8ff5a0f4af169d9bb18c5838d2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Update comments about PackStatisticsTerry Parker2015-06-162-4/+14
| | | | | | | | | | Change-Id: I4862932dc38b58cc98400ed584cc506013846065 Signed-off-by: Terry Parker <tparker@google.com>
* | Add the set of shallow commits to PackStatisticsTerry Parker2015-06-153-0/+24
| | | | | | | | | | Change-Id: I976102e054369b045340d4b9209984b5243e3750 Signed-off-by: Terry Parker <tparker@google.com>
* | Add tests for HMACSHA1NonceGeneratorDave Borowitz2015-06-153-11/+151
| | | | | | | | | | | | | | Correct documentation of NonceStatus.OK/SLOP to match the implemented behavior. Change-Id: Id5ec1945eab76db6d2e4b592cb25907ea3d835cd
* | Merge "Introduce PostUploadHook to replace UploadPackLogger"Shawn Pearce2015-06-1210-114/+766
|\ \
| * | Introduce PostUploadHook to replace UploadPackLoggerTerry Parker2015-06-1210-114/+766
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadPackLogger is incorrectly named--it can be used to trigger any post upload action, such as GC/compaction. This change introduces PostUploadHook/PostUploadHookChain to replace UploadPackLogger/UploadPackLoggerChain and deprecates the latter. It also introduces PackStatistics as a replacement for PackWriter.Statistics, since the latter is not public API. It changes PackWriter to use PackStatistics and reimplements PackWriter.Statistics to delegate to PackStatistics. Change-Id: Ic51df1613e471f568ffee25ae67e118425b38986 Signed-off-by: Terry Parker <tparker@google.com>
* | | Treat CloneCommand.setBranch(null) as setBranch("HEAD")Jonathan Nieder2015-06-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is documented to take a branch name (not a possibly null string). The only way a caller could have set null without either re-setting to a sane value afterward or producing NullPointerException was to also call setNoCheckout(true), in which case there would have been no reason to set the branch in the first place. Make setBranch(null) request the default behavior (remote's default branch) instead, imitating C git's clone --no-branch. Change-Id: I960e7046b8d5b5bc75c7f3688f3a075d3a951b00 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | Treat CloneCommand.setRemote(null) as setRemote("origin")Jonathan Nieder2015-06-112-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A non-bare clone command with null remote produces a NullPointerException when trying to produce a refspec to fetch against. In a bare repository, a null remote name is accepted by mistake, producing a configuration with items like 'remote.url' instead of 'remote.<remote>.url'. This was never meant to work. Instead, let's make setRemote(null) undo any previous setRemote calls and re-set the remote name to DEFAULT_REMOTE, imitating C git clone's --no-origin option. While we're here, add some tests for setRemote working normally. Change-Id: I76f502da5e677df501d3ef387e7f61f42a7ca238 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | Document CloneCommand.setURI(null)Jonathan Nieder2015-06-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | call() throws InvalidRemoteException if uri == null, so there should never be reason to leave the URI set to null. Document this. Change-Id: I7f2cdbe8042d99cf8a3c1a8c4c2dcb58c5b8c305 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | Handle null in ProgressMonitor settersJonathan Nieder2015-06-116-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These commands' monitor fields can never be null unless someone passes null to setProgressMonitor. Anyone passing null probably meant to disable the ProgressMonitor, so do that (by falling back to NullProgressMonitor.INSTANCE) instead of saving a null and eventually producing NullPointerException. Change-Id: I63ad93ea8ad669fd333a5fd40880e7583ba24827 Signed-off-by: Jonathan Nieder <jrn@google.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-04 23:36:16 +0000