1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
|
package git
import (
"fmt"
"strconv"
"strings"
"testing"
"time"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
"google.golang.org/protobuf/types/known/timestamppb"
)
func TestNewSignature(t *testing.T) {
expectedSignature := Signature{
Name: "foo",
Email: "foo@example.com",
When: time.Unix(1234567890, 0).In(time.UTC),
}
for _, tt := range []struct {
name string
userName string
userEmail string
when time.Time
expected Signature
}{
{
name: "valid params",
userName: "foo",
userEmail: "foo@example.com",
when: time.Unix(1234567890, 0).In(time.UTC),
expected: expectedSignature,
},
{
name: "special characters in username are replaced",
userName: "<foo>\n",
userEmail: "foo@example.com",
when: time.Unix(1234567890, 0).In(time.UTC),
expected: expectedSignature,
},
{
name: "special characters in email are replaced",
userName: "foo",
userEmail: "<foo@example.com>\n",
when: time.Unix(1234567890, 0).In(time.UTC),
expected: expectedSignature,
},
{
name: "time is truncated to seconds",
userName: "foo",
userEmail: "foo@example.com",
when: time.Unix(1234567890, 123).In(time.UTC),
expected: expectedSignature,
},
} {
t.Run(tt.name, func(t *testing.T) {
require.Equal(t, tt.expected, NewSignature(tt.userName, tt.userEmail, tt.when))
})
}
}
func TestFormatTime(t *testing.T) {
t.Parallel()
for _, tc := range []struct {
desc string
t time.Time
expectedString string
expectedSignature string
expectedParsedTime time.Time
}{
{
desc: "zero value",
t: time.Time{},
expectedString: "Mon Jan 01 0001 00:00:00 +0000",
expectedSignature: "-62135596800 +0000",
expectedParsedTime: time.Date(1, time.January, 1, 0, 0, 0, 0, time.FixedZone("", 0)),
},
{
desc: "Unix birth time",
t: time.Unix(0, 0).In(time.UTC),
expectedString: "Thu Jan 01 1970 00:00:00 +0000",
expectedSignature: "0 +0000",
expectedParsedTime: time.Date(1970, time.January, 1, 0, 0, 0, 0, time.FixedZone("", 0)),
},
{
desc: "recent UTC date",
t: time.Date(2023, time.August, 29, 9, 15, 46, 0, time.FixedZone("", 0)),
expectedString: "Tue Aug 29 2023 09:15:46 +0000",
expectedSignature: "1693300546 +0000",
expectedParsedTime: time.Date(2023, time.August, 29, 9, 15, 46, 0, time.FixedZone("", 0)),
},
{
desc: "recent date in non-standard timezone",
t: time.Date(2023, time.August, 29, 9, 15, 46, 0, time.FixedZone("CEST", 2*60*60)),
expectedString: "Tue Aug 29 2023 09:15:46 +0200",
expectedSignature: "1693293346 +0200",
expectedParsedTime: time.Date(2023, time.August, 29, 9, 15, 46, 0, time.FixedZone("", 2*60*60)),
},
{
desc: "sub-second accuracy is ignored",
t: time.Date(2023, time.August, 29, 9, 15, 46, 9000, time.FixedZone("CEST", 2*60*60)),
expectedString: "Tue Aug 29 2023 09:15:46 +0200",
expectedSignature: "1693293346 +0200",
expectedParsedTime: time.Date(2023, time.August, 29, 9, 15, 46, 0, time.FixedZone("", 2*60*60)),
},
} {
t.Run(tc.desc, func(t *testing.T) {
t.Run("FormatTime", func(t *testing.T) {
actualString := FormatTime(tc.t)
require.Equal(t, tc.expectedString, actualString)
// We use `time.ParseInLocation()` here such that Go won't automatically translate e.g. `+0200`
// into "CEST" or `time.Local`.
actualParsedTime, err := time.ParseInLocation(Rfc2822DateFormat, actualString, time.FixedZone("", 0))
require.NoError(t, err)
require.Equal(t, tc.expectedParsedTime, actualParsedTime)
})
t.Run("FormatSignatureTime", func(t *testing.T) {
actualSignature := FormatSignatureTime(tc.t)
require.Equal(t, tc.expectedSignature, actualSignature)
unixTimeStr, timezoneStr, ok := strings.Cut(actualSignature, " ")
require.True(t, ok)
unixTime, err := strconv.ParseInt(unixTimeStr, 10, 64)
require.NoError(t, err)
timezone, err := time.ParseInLocation("-0700", timezoneStr, time.FixedZone("", 0))
require.NoError(t, err)
require.Equal(t, tc.expectedParsedTime, time.Unix(unixTime, 0).In(timezone.Location()))
})
})
}
}
func TestSignatureFromRequest(t *testing.T) {
t.Parallel()
const defaultUsername = "Jane Doe"
const defaultEmail = "janedoe@gitlab.com"
testCases := []struct {
desc string
setup func() (RequestWithUserAndTimestamp, Signature, error)
}{
{
desc: "user with UTC timezone",
setup: func() (RequestWithUserAndTimestamp, Signature, error) {
timeNow := time.Now()
return &gitalypb.UserSquashRequest{
User: &gitalypb.User{
Name: []byte(defaultUsername),
Email: []byte(defaultEmail),
Timezone: "UTC",
},
Timestamp: timestamppb.New(timeNow),
},
Signature{
Name: defaultUsername,
Email: defaultEmail,
When: time.Unix(timeNow.Unix(), 0).In(time.UTC),
},
nil
},
},
{
desc: "user with Shanghai timezone",
setup: func() (RequestWithUserAndTimestamp, Signature, error) {
timezone := "Asia/Shanghai"
expectedLoc, err := time.LoadLocation(timezone)
require.NoError(t, err)
timeNow := time.Now()
return &gitalypb.UserSquashRequest{
User: &gitalypb.User{
Name: []byte(defaultUsername),
Email: []byte(defaultEmail),
Timezone: timezone,
},
Timestamp: timestamppb.New(timeNow),
},
Signature{
Name: defaultUsername,
Email: defaultEmail,
When: time.Unix(timeNow.Unix(), 0).In(expectedLoc),
},
nil
},
},
{
desc: "invalid timezone",
setup: func() (RequestWithUserAndTimestamp, Signature, error) {
timezone := "Invalid/Timezone"
expectedErr := fmt.Errorf("unknown time zone %s", timezone)
_, err := time.LoadLocation(timezone)
require.Equal(t, expectedErr, err)
return &gitalypb.UserSquashRequest{
User: &gitalypb.User{
Name: []byte(defaultUsername),
Email: []byte(defaultEmail),
Timezone: timezone,
},
Timestamp: timestamppb.New(time.Now()),
},
Signature{},
expectedErr
},
},
{
desc: "no timezone specified",
setup: func() (RequestWithUserAndTimestamp, Signature, error) {
timeNow := time.Now()
return &gitalypb.UserSquashRequest{
User: &gitalypb.User{
Name: []byte(defaultUsername),
Email: []byte(defaultEmail),
},
Timestamp: timestamppb.New(timeNow),
},
Signature{
Name: defaultUsername,
Email: defaultEmail,
When: time.Unix(timeNow.Unix(), 0).In(time.UTC),
},
nil
},
},
{
desc: "request without user",
setup: func() (RequestWithUserAndTimestamp, Signature, error) {
timeNow := time.Now()
return &gitalypb.UserSquashRequest{
User: nil,
Timestamp: timestamppb.New(timeNow),
},
Signature{
When: time.Unix(timeNow.Unix(), 0).In(time.UTC),
},
nil
},
},
}
for _, testCase := range testCases {
t.Run(testCase.desc, func(t *testing.T) {
req, expectedSignature, expectedErr := testCase.setup()
sig, err := SignatureFromRequest(req)
require.Equal(t, expectedErr, err)
require.Equal(t, expectedSignature, sig)
})
}
}
|
