Commit Graph

3931 Commits

Author SHA1 Message Date
Dave Borowitz a85e817dc2 Rewrite push certificate parsing
- Consistently return structured data, such as actual ReceiveCommands,
  which is more useful for callers that are doing things other than
  verifying the signature, e.g. recording the set of commands.
- Store the certificate version field, as this is required to be part
  of the signed payload.
- Add a toText() method to recreate the actual payload for signature
  verification. This requires keeping track of the un-chomped command
  strings from the original protocol stream.
- Separate the parser from the certificate itself, so the actual
  PushCertificate object can be immutable. Make a fair attempt at deep
  immutability, but this is not possible with the current mutable
  ReceiveCommand structure.
- Use more detailed error messages that don't involve NON-NLS strings.
- Document null return values more thoroughly. Instead of having the
  undocumented behavior of throwing NPE from certain methods if they
  are not first guarded by enabled(), eliminate enabled() and return
  null from those methods.
- Add tests for parsing a push cert from a section of pkt-line stream
  using a real live stream captured with Wireshark (which, it should
  be noted, uncovered several simply incorrect statements in C git's
  Documentation/technical/pack-protocol.txt).

This 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: I5382193347a8eb1811032d9b32af9651871372d0
2015-06-11 11:52:42 -04:00
Christian Halstrick 53fb3e3dd3 Merge "submodule test: Use config.unset instead of setting to null" 2015-06-11 07:44:35 -04:00
Christian Halstrick f9380fb479 Merge "Add new submodule layout to SubmoduleAddCommand" 2015-06-11 05:13:22 -04:00
Dave Borowitz d43703624c Allow trailing newlines in receive-pack
C git's receive-pack.c strips trailing newlines in command lists when
present[1], although send-pack.c does not send them, at least in the
case of command lists[2]. Change JGit to match this behavior.
Add tests.

This also fixes parsing of commands in the push cert, which, unlike
commands sent in the non-push case, always have trailing newlines.

[1] 7974889a05/builtin/receive-pack.c (L1380)
where packet_read_line chomps newlines:
7974889a05/pkt-line.c (L202)

[2] 7974889a05/send-pack.c (L470)

Change-Id: I4bca6342a7482a53c9a5815a94b3c181a479d04b
2015-06-10 15:37:55 -07:00
Christian Halstrick 4531259613 Add new submodule layout to SubmoduleAddCommand
The new submodule layout where GITDIR of a submodule is located at
<parent-repo-GITDIR>/modules/<submodule-path> was only used during
clone. Teach SubmoduleAddCommand to use the new layout.

Bug: 469666
Change-Id: Ie97dc0607b71499560444616f362bccee9cce515
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-11 00:11:27 +02:00
Jonathan Nieder 3b7ca2b8a8 Tweak exception Javadoc to be eclipse-clean
Bug: 469887
Change-Id: Ic189efc50d9c1f573dda0c79e5b0dad0813a5577
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-10 15:08:41 -07:00
Jonathan Nieder a1fd4980df submodule test: Use config.unset instead of setting to null
Most relative-URL tests for SubmoduleInitCommand carry out the following
steps:

 1. add a submodule at path "sub" to the index
 2. set remote.origin.url in .git/config
 3. configure .gitmodules, possibly using relative URLs, and see what
    happens

resolveWorkingDirectoryRelativeUrl() is meant to test the fallback when
remote.origin.url is not set, to match C git which treats the URL as
relative to the cwd in that case.  To do so, in step (2) it sets
remote.origin.url to null.

However, Config.setString when taking a null value does not actually
unset that value from the configuration --- it sets it to the empty
string.  This means we are testing a behavior that C git never
supported.  Use Config.unset instead.

Change-Id: I7af29fbbd333a2598843d62c320093c48b2ad972
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-10 14:48:21 -07:00
Jonathan Nieder 2508f1695f Merge changes I38e1798e,Id1fe1c20,I945ba188,I2c6be9cb
* changes:
  Allow setting detail message and cause when constructing most exceptions
  Use message from ServiceNotAuthorizedException, ServiceNotEnabledException
  dumb HTTP: Clarify AsIsFilter by introducing req and res locals
  Clarify description of ServiceNotAuthorizedException
2015-06-10 16:40:11 -04:00
Shawn Pearce 719069680d Merge "UploadPack: Use reachable-sha1-in-want configuration" 2015-06-09 22:14:38 -04:00
Jonathan Nieder 31b37c3584 Add missing imports for javadoc to ObjectCountCallback
Change-Id: I24780a28c01047654d81af09045d88c6a84950b6
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-09 18:38:08 -07:00
Jonathan Nieder 2c728913d1 Merge "Fix public API issues introduced in I1baeedcc6946." 2015-06-09 20:45:16 -04:00
Yuxuan 'fishy' Wang 9cbe222837 Fix public API issues introduced in I1baeedcc6946.
Move ObjectCountCallback and WriteAbortedException to package
org.eclipse.jgit.transport, so that they'll become public API.

Change-Id: I95e3cfaa49f3f7371e794d5c253cf6981f87cae0
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
2015-06-09 17:20:13 -07:00
Matthias Sohn 8468fae293 Document empty catch block to silence warning
Change-Id: I643f916e394ca95272b58d0b5826e81cc1092f2f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 20:12:27 -04:00
Jonathan Nieder e03928f160 Merge "Fix imports in BundleWriter" 2015-06-09 20:12:08 -04:00
Matthias Sohn 62d99e6fd0 Fix imports in BundleWriter
Change-Id: I5eb186ad27c93feab2664fcbcc9ca0b617a15462
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 19:50:13 -04:00
Jonathan Nieder e25a3076f7 Merge "Add missing javadoc @param for new method setObjectCountCallback()" 2015-06-09 19:47:03 -04:00
Jonathan Nieder e75bc4321a Merge "Revert "Config: Distinguish between empty and null strings"" 2015-06-09 19:45:34 -04:00
Matthias Sohn 65ceb23c81 Add missing javadoc @param for new method setObjectCountCallback()
Change-Id: I91acdc3680bde09ae5809c14460500223a410395
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-10 01:26:00 +02:00
Matthias Sohn 852cc71344 Remove no longer used API warning filter for FileUtil
Change-Id: Ic13943139f23cdb1eac840417de43796236d578f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-10 01:21:45 +02:00
Jonathan Nieder cd3d952ec6 Revert "Config: Distinguish between empty and null strings"
This reverts commit 96eb3ee397, which
broke Gerrit tests that set a config value to 'null', serialize the
result, deserialize, and expect 'null' from Config.getString[1].

The intent of that commit was to make it possible to distinguish between
an absent and an empty config value, which we'll have to do with a new
method.

Revert the behavior change.  Keep the tests from 428cb23f2de8, since
they test the behavior more precisely than the old tests did.

[1] https://gerrit-review.googlesource.com/68452

Change-Id: Ie8042f380ea0e34e3203e1991aa0feb2e6e44641
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-09 15:58:12 -07:00
Yuxuan 'fishy' Wang 03fce81be3 Fix a javadoc typo in RepoProject.
Change-Id: I3ea25c157b9e11a46a140d2c3ab9373d1596c163
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
2015-06-09 14:24:36 -07:00
Yuxuan 'fishy' Wang 53be446f6a Callback in PackWriter & BundleWriter.
Added callback in PackWriter and BundleWriter for the caller to get the
count of objects to write, and a chance to abort the write operation.

Change-Id: I1baeedcc6946b1093652de4a707fe597a577e526
Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
2015-06-09 14:11:13 -07:00
Fredrik Medley 96f210f4b7 UploadPack: Use reachable-sha1-in-want configuration
C git 2.5 supports setting the equivalent of
RequestPolicy.REACHABLE_COMMIT with uploadpack.allowreachablesha1inwant.
Parse this into TransportConfig and use it from UploadPack. An explicitly
set RequestPolicy overrides the config, and the policy may still be
upgraded on a unidirectional connection to avoid races.

Change-Id: Id39771a6e42d8082099acde11249306828a053c0
Signed-off-by: Fredrik Medley <fredrik.medley@gmail.com>
2015-06-09 18:43:48 +02:00
Matthias Sohn a89dbbd87e Merge branch 'stable-4.0'
* stable-4.0:
  Prepare 4.0.1-SNAPSHOT builds
  JGit v4.0.0.201506090130-r
  Update build to use Tycho 0.23

Change-Id: I732b601c198ad1a50aa7ba3c1d1fb516b10912b5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 17:17:18 +02:00
Matthias Sohn 2dd4dc149c Prepare 4.0.1-SNAPSHOT builds
Change-Id: I51d03d1a47d1e3cd453701e397750749867028a2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 15:17:22 +02:00
Matthias Sohn 4f22185455 JGit v4.0.0.201506090130-r
Change-Id: I01ad84fc74555656c42934cd62a85269a7030557
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-09 07:29:27 +02:00
Jonathan Nieder c1fca6cb43 Add missing # to javadoc comment
Change-Id: I351cee0ba2e77e3360846ac0c5368da3a322725c
Reported-by: Markus Keller <markus_keller@ch.ibm.com>
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-08 10:47:15 -07:00
Matthias Sohn d8040f3406 Update build to use Tycho 0.23
see https://wiki.eclipse.org/Tycho/Release_Notes/0.23

Change-Id: I70e6711294e2a92efa77fd9dd1c906c449c9b4db
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-08 12:59:28 +02:00
Jonathan Nieder 48b67012d6 Allow lookup of multiple exact refs in one shot
exactRef(ref1, ref2, ref3) requests multiple specific refs in a single
lookup, which may be faster in some backends than looking them up one by
one.

firstExactRef generalizes getRef by finding the first existing ref from
the list of refs named.  Its main purpose is for the default
implementation of getRef (finding the first existing ref in a search
path).  Hopefully it can be useful for other operations that look for
refs in a search path (e.g., git log --notes=<name>), too.

Change-Id: I5c6fcf1d3920f6968b8b97f3d4c3a267258c4b86
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-05 16:08:55 -07:00
Jonathan Nieder a04d1ad2f1 Introduce exactRef to read a ref whose exact name is known
Unlike getRef(name), the new exactRef method does not walk the search
path.  This should produce a less confusing result than getRef when the
exact ref name is known: it will not try to resolve refs/foo/bar to
refs/heads/refs/foo/bar even when refs/foo/bar does not exist.

It can be faster than both getRefs(ALL).get(name) and getRef(name)
because it only needs to examine a single ref.

A follow-up change will introduce a findRef synonym to getRef and
deprecate getRef to make the choice a caller is making more obvious
(exactRef or findRef, with the same semantics as getRefs(ALL).get and
getRefs(ALL).findRef).

Change-Id: If1bd09bcfc9919e7976a4d77f13184ea58dcda52
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-05 14:14:55 -07:00
Shawn Pearce 336092afa7 Merge "Restore checkObjectCollisions flag" 2015-06-04 16:35:51 -04:00
David Pletcher c06620882b Restore checkObjectCollisions flag
I am developing an offline pack verification feature based on
PackParser. The birthday collision check is a prohibitive obstacle
to performance at scale because it interacts with the repository
to perform collision checks. This CL restores the checkObjectCollisions
flag that was removed in 9638e0aa87,
while changing the flag getter and setter to protected from public as a
precaution against misuse.

Change-Id: I363cd0c9de57c5e8659cdfe2d51b17823f4fe793
Signed-off-by: David Pletcher <dpletcher@google.com>
2015-06-04 13:26:36 -07:00
Dave Borowitz b9f850a79b Config: Allow ending a file with "=" and no newline
This is a perfectly valid construction according to C git:

$ echo -en '[a]\nx =' > foo.config
$ git config -f foo.config a.x; echo $?

0

Change-Id: Icfcf8304adb43c79e2b8b998f8d651b2a94f6acb
2015-06-04 11:50:31 -07:00
Dave Borowitz 96eb3ee397 Config: Distinguish between empty and null strings
The C git API and command line tools distinguish between a key having
the empty string as a value and no key being present in the config
file:

$ echo -e '[a]\nx =' > foo.config
$ git config -f foo.config a.x; echo $?

0
$ git config -f foo.config a.y; echo $?
1

Make JGit make the same distinction. This is in line with the current
Javadoc of getString, which claims to return "a String value from the
config, null if not found". It is more reasonable to interpret "x ="
in the above example as "found" rather than "missing".

We need to maintain the special handling of a key name with no "="
resolving to a boolean true, but "=" with an empty string is still not
a valid boolean.

Change-Id: If0dbb7470c524259de0b167148db87f81be2d04a
2015-06-04 11:50:31 -07:00
Jonathan Nieder 6227b340d3 Merge branch 'stable-4.0'
* stable-4.0:
  Revert "Fix unchecked conversion warning in MergeFormatter"
  Delete deprecated TemporaryBuffer.LocalFile constructors
  Delete deprecated FileUtils.setExecute(File, boolean)
  Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)
  Delete deprecated UploadPackMayNotContinueException
  Delete deprecated TransferConfig.isFsckObjects()
  Delete deprecated TextBuiltin.out
  Delete deprecated Merger.getBaseCommit()

Change-Id: Id23a39cc6a3cd122ff1738cb85b7451bbfd8af5f
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-03 12:27:17 -07:00
Shawn Pearce fb21fb10fc Revert "Fix unchecked conversion warning in MergeFormatter"
This reverts commit 6d4ebd168d.

Change-Id: I01f0c7cd997b9b3577cc1e98ab1adb5cdc5b55e4
2015-06-03 14:31:41 -04:00
Matthias Sohn d19ce2435d Delete deprecated TemporaryBuffer.LocalFile constructors
Change-Id: I5fdbf997ebcbe48e86f4c41c6b2643f47054b0c3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:27 +02:00
Matthias Sohn f691106547 Delete deprecated FileUtils.setExecute(File, boolean)
Change-Id: Ifa63e3743fb4de25e074404c301f860a1ffb5e02
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:27 +02:00
Matthias Sohn ba51037a69 Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean)
Change-Id: I687c392e5a625fd66c45998c94373aa59921b986
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 08c8cf027d Delete deprecated UploadPackMayNotContinueException
Change-Id: Id298fc860684d2a2288769282fd8ce4475009dc8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn fa56e0deae Delete deprecated TransferConfig.isFsckObjects()
Change-Id: Ib7f36282d69a3298b1ac177ae17af0f80d64964f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 07114d99a0 Delete deprecated TextBuiltin.out
Change-Id: I184c2f0e0203fa95e0a117391bae93da0d23a435
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:26 +02:00
Matthias Sohn 913095e39e Delete deprecated Merger.getBaseCommit()
Change-Id: I3b39a2c0d547110709b4c28b66c4694cdef943e8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 13:16:25 +02:00
Terry Parker dd22bc831a Update PackWriter.Statistics.getBitmapIndexMises()
Return -1 from PackWriter.Statistics.getBitmapIndexMises() when no
bitmap indices were found, to differentiate it from the case where
the bitmap indices contained all of the want/have commits.

Change-Id: I78d4600b462c19f62b347217a0b2c19eaaf3a14b
Signed-off-by: Terry Parker <tparker@google.com>
2015-06-02 22:49:55 -04:00
Jonathan Nieder 8c3fe215b4 Allow setting detail message and cause when constructing most exceptions
In particular, this means a RepositoryResolver, UploadPackFactory, or
ReceivePackFactory can set a detail message for
ServiceNotAuthorizedException or ServiceNotEnabledException with
information for the client about why access is not allowed.

Change-Id: I38e1798e1e9d09b5e75cefacd9d85f25729235a9
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-02 16:54:09 -07:00
Jonathan Nieder cc4f4f2fe1 Use message from ServiceNotAuthorizedException, ServiceNotEnabledException
When sending an error response due to ServiceNotAuthorizedException or
ServiceNotEnabledException, usually we send a default message.  In the
ServiceNotEnabledException case, we use

	403 Git access forbidden

except in a dumb-HTTP-specific filter where we use the servlet
container's default 403 response:

	403 Forbidden

In the ServiceNotAuthorizedException case, we use the servlet
container's default 401 response:

	401 Unauthorized

There is one exception: a ServiceNotEnabledException when handling a
smart HTTP /info/refs request uses the message from the exception:

	403 Service not enabled

Be more consistent by always using the message from the exception.  This
way, authors of a RepositoryResolver, UploadPackFactory, or
ReceivePackFactory can provide a more detailed message when appropriate.
The defaults are

	401 Unauthorized
	403 Service not enabled

Change-Id: Id1fe1c2042fb96487c3671c1965c8a65c4b8e1b8
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-02 16:54:08 -07:00
Jonathan Nieder 761e61f1ed dumb HTTP: Clarify AsIsFilter by introducing req and res locals
No functional change.

Change-Id: I945ba18879c360f433e026aa125ef3f9f6a75793
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-02 16:54:08 -07:00
Jonathan Nieder 54b195ad3e Clarify description of ServiceNotAuthorizedException
This exception's detail message states

	Service not permitted

and according to the Javadoc it indicates that the current user does not
have access to the service.  In practice, though, callers handle this
exception by presenting a '401 Unauthorized' response to the client,
meaning that the user is unauthenticated and should authenticate.

Clarify the documentation and detail message to match the practice.

The exception message is not used anywhere except logs.  No
client-visible effect intended.

Change-Id: I2c6be9cb74af932f0dcb121a381a64f2ad876766
Signed-off-by: Jonathan Nieder <jrn@google.com>
2015-06-02 16:54:07 -07:00
Matthias Sohn a79168bcbb Prepare 4.1.0-SNAPSHOT builds
Change-Id: I03d08b8e2d3400d4b5cdb4ab541b312870776843
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 00:52:00 +02:00
Matthias Sohn 97aa021145 Merge branch 'stable-4.0'
* stable-4.0:
  Prepare post 4.0-RC3 builds
  JGit v4.0.0.201506020755-rc3

Change-Id: I3387e5d90a24645cba736a2d0739fb95cd557049
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-06-03 00:27:27 +02:00