upload-pack, serve: log received client session ID
When upload-pack (protocol v0/v1) or a protocol v2 server receives a session-id capability from a client, log the received session ID via a trace2 data event. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Josh Steadmon committed
Nov 11, 2020 at 15:29 UTC
829594677c3cd02f7d88b3cd3c72ad06f68faa14
3 files changed
+24
-6
serve.c
+4
@@ -201,6 +201,7 @@ static int process_request(void)
201
struct packet_reader reader;
202
struct strvec keys = STRVEC_INIT;
203
struct protocol_capability *command = NULL;
204
+ const char *client_sid;
205
206
packet_reader_init(&reader, 0, NULL, 0,
207
PACKET_READ_CHOMP_NEWLINE |
@@ -264,6 +265,9 @@ static int process_request(void)
265
266
check_algorithm(the_repository, &keys);
267
268
+ if (has_capability(&keys, "session-id", &client_sid))
269
+ trace2_data_string("transfer", NULL, "client-sid", client_sid);
270
+
271
command->command(the_repository, &keys, &reader);
272
273
strvec_clear(&keys);
t/t5705-session-id-in-capabilities.sh
+12
-6
@@ -17,11 +17,14 @@ test_expect_success 'setup repos for session ID capability tests' '
17
for PROTO in 0 1 2
18
do
19
test_expect_success "session IDs not advertised by default (fetch v${PROTO})" '
20
- test_when_finished "rm -rf local tr2-client-events" &&
20
+ test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
21
cp -r "$LOCAL_PRISTINE" local &&
22
GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
23
- git -c protocol.version=$PROTO -C local fetch origin &&
24
- test -z "$(grep \"key\":\"server-sid\" tr2-client-events)"
23
+ git -c protocol.version=$PROTO -C local fetch \
24
+ --upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
25
+ origin &&
26
+ test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
27
+ test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
28
'
29
30
test_expect_success "session IDs not advertised by default (push v${PROTO})" '
@@ -43,11 +46,14 @@ test_expect_success 'enable SID advertisement' '
46
for PROTO in 0 1 2
47
do
48
test_expect_success "session IDs advertised (fetch v${PROTO})" '
46
- test_when_finished "rm -rf local tr2-client-events" &&
49
+ test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
50
cp -r "$LOCAL_PRISTINE" local &&
51
GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
49
- git -c protocol.version=$PROTO -C local fetch origin &&
50
- grep \"key\":\"server-sid\" tr2-client-events
52
+ git -c protocol.version=$PROTO -C local fetch \
53
+ --upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
54
+ origin &&
55
+ grep \"key\":\"server-sid\" tr2-client-events &&
56
+ grep \"key\":\"client-sid\" tr2-server-events
57
'
58
59
test_expect_success "session IDs advertised (push v${PROTO})" '
upload-pack.c
+8
@@ -1058,6 +1058,7 @@ static void receive_needs(struct upload_pack_data *data,
1058
const char *features;
1059
struct object_id oid_buf;
1060
const char *arg;
1061
+ int feature_len;
1062
1063
reset_timeout(data->timeout);
1064
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
@@ -1110,6 +1111,13 @@ static void receive_needs(struct upload_pack_data *data,
1111
parse_feature_request(features, "filter"))
1112
data->filter_capability_requested = 1;
1113
1114
+ arg = parse_feature_value(features, "session-id", &feature_len, NULL);
1115
+ if (arg) {
1116
+ char *client_sid = xstrndup(arg, feature_len);
1117
+ trace2_data_string("transfer", NULL, "client-sid", client_sid);
1118
+ free(client_sid);
1119
+ }
1120
+
1121
o = parse_object(the_repository, &oid_buf);
1122
if (!o) {
1123
packet_writer_error(&data->writer,