Skip to content

Commit

Permalink
Merge branch 'master' into feature/bindOn
Browse files Browse the repository at this point in the history
* master:
  Update test certificates
  2.87.1
  Update changelog
  2.87.0
  Replace hawk dependency with a local implemenation (request#2943)
  • Loading branch information
kunagpal committed Jul 9, 2018
2 parents 04f61df + ace4f31 commit e9797e7
Show file tree
Hide file tree
Showing 16 changed files with 465 additions and 243 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,8 @@
## Change Log

### v2.87.0 (2018/05/21)
- [#2943](https://github.com/request/request/pull/2943) Replace hawk dependency with a local implemenation (#2943) (@hueniverse)

### v2.86.0 (2018/05/15)
- [#2885](https://github.com/request/request/pull/2885) Remove redundant code (for Node.js 0.9.4 and below) and dependency (@ChALkeR)
- [#2942](https://github.com/request/request/pull/2942) Make Test GREEN Again! (@simov)
Expand Down
89 changes: 89 additions & 0 deletions lib/hawk.js
@@ -0,0 +1,89 @@
'use strict'

var crypto = require('crypto')

function randomString (size) {
var bits = (size + 1) * 6
var buffer = crypto.randomBytes(Math.ceil(bits / 8))
var string = buffer.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '')
return string.slice(0, size)
}

function calculatePayloadHash (payload, algorithm, contentType) {
var hash = crypto.createHash(algorithm)
hash.update('hawk.1.payload\n')
hash.update((contentType ? contentType.split(';')[0].trim().toLowerCase() : '') + '\n')
hash.update(payload || '')
hash.update('\n')
return hash.digest('base64')
}

exports.calculateMac = function (credentials, opts) {
var normalized = 'hawk.1.header\n' +
opts.ts + '\n' +
opts.nonce + '\n' +
(opts.method || '').toUpperCase() + '\n' +
opts.resource + '\n' +
opts.host.toLowerCase() + '\n' +
opts.port + '\n' +
(opts.hash || '') + '\n'

if (opts.ext) {
normalized = normalized + opts.ext.replace('\\', '\\\\').replace('\n', '\\n')
}

normalized = normalized + '\n'

if (opts.app) {
normalized = normalized + opts.app + '\n' + (opts.dlg || '') + '\n'
}

var hmac = crypto.createHmac(credentials.algorithm, credentials.key).update(normalized)
var digest = hmac.digest('base64')
return digest
}

exports.header = function (uri, method, opts) {
var timestamp = opts.timestamp || Math.floor((Date.now() + (opts.localtimeOffsetMsec || 0)) / 1000)
var credentials = opts.credentials
if (!credentials || !credentials.id || !credentials.key || !credentials.algorithm) {
return ''
}

if (['sha1', 'sha256'].indexOf(credentials.algorithm) === -1) {
return ''
}

var artifacts = {
ts: timestamp,
nonce: opts.nonce || randomString(6),
method: method,
resource: uri.pathname + (uri.search || ''),
host: uri.hostname,
port: uri.port || (uri.protocol === 'http:' ? 80 : 443),
hash: opts.hash,
ext: opts.ext,
app: opts.app,
dlg: opts.dlg
}

if (!artifacts.hash && (opts.payload || opts.payload === '')) {
artifacts.hash = calculatePayloadHash(opts.payload, credentials.algorithm, opts.contentType)
}

var mac = exports.calculateMac(credentials, artifacts)

var hasExt = artifacts.ext !== null && artifacts.ext !== undefined && artifacts.ext !== ''
var header = 'Hawk id="' + credentials.id +
'", ts="' + artifacts.ts +
'", nonce="' + artifacts.nonce +
(artifacts.hash ? '", hash="' + artifacts.hash : '') +
(hasExt ? '", ext="' + artifacts.ext.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : '') +
'", mac="' + mac + '"'

if (artifacts.app) {
header = header + ', app="' + artifacts.app + (artifacts.dlg ? '", dlg="' + artifacts.dlg : '') + '"'
}

return header
}
2 changes: 0 additions & 2 deletions package.json
Expand Up @@ -31,7 +31,6 @@
"forever-agent": "~0.6.1",
"form-data": "~2.3.1",
"har-validator": "~5.0.3",
"hawk": "~6.0.2",
"http-signature": "~1.2.0",
"is-typedarray": "~1.0.0",
"isstream": "~0.1.2",
Expand Down Expand Up @@ -78,7 +77,6 @@
},
"greenkeeper": {
"ignore": [
"hawk",
"har-validator"
]
}
Expand Down
4 changes: 2 additions & 2 deletions request.js
Expand Up @@ -6,7 +6,6 @@ var url = require('url')
var util = require('util')
var stream = require('stream')
var zlib = require('zlib')
var hawk = require('hawk')
var aws2 = require('aws-sign2')
var aws4 = require('aws4')
var httpSignature = require('http-signature')
Expand All @@ -25,6 +24,7 @@ var Querystring = require('./lib/querystring').Querystring
var Har = require('./lib/har').Har
var Auth = require('./lib/auth').Auth
var OAuth = require('./lib/oauth').OAuth
var hawk = require('./lib/hawk')
var Multipart = require('./lib/multipart').Multipart
var Redirect = require('./lib/redirect').Redirect
var Tunnel = require('./lib/tunnel').Tunnel
Expand Down Expand Up @@ -1468,7 +1468,7 @@ Request.prototype.httpSignature = function (opts) {
}
Request.prototype.hawk = function (opts) {
var self = this
self.setHeader('Authorization', hawk.client.header(self.uri, self.method, opts).field)
self.setHeader('Authorization', hawk.header(self.uri, self.method, opts))
}
Request.prototype.oauth = function (_oauth) {
var self = this
Expand Down
2 changes: 1 addition & 1 deletion tests/ssl/ca/ca.srl
@@ -1 +1 @@
ADF62016AA40C9C4
ADF62016AA40C9C5
52 changes: 26 additions & 26 deletions tests/ssl/ca/client-enc.key
@@ -1,30 +1,30 @@
-----BEGIN RSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
DEK-Info: AES-128-CBC,DFE9B15161553AFAA662AC7EACFB6D35
DEK-Info: AES-128-CBC,7FD4AC5078EE99FCA866A397D64EAC81

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
-----END RSA PRIVATE KEY-----
24 changes: 12 additions & 12 deletions tests/ssl/ca/client.crt
@@ -1,20 +1,20 @@
-----BEGIN CERTIFICATE-----
MIIDLjCCApcCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC
MIIDLjCCApcCCQCt9iAWqkDJxDANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1
ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG
A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n
ZXJzLmNvbTAeFw0xNTA4MDMxNjM5MDJaFw0xODA4MDIxNjM5MDJaMIGPMQswCQYD
ZXJzLmNvbTAeFw0xODA3MDgxMTQ5MjRaFw0yMTA3MDcxMTQ5MjRaMIGPMQswCQYD
VQQGEwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB09ha2xhbmQxEDAOBgNVBAoM
B3JlcXVlc3QxGjAYBgNVBAsMEXJlcXVlc3RAbG9jYWxob3N0MRMwEQYDVQQDDApU
ZXN0Q2xpZW50MR4wHAYJKoZIhvcNAQkBFg9kby5ub3RAZW1haWwubWUwggEiMA0G
CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYSkr4lssxol4y0Q/1mj9S1FAZ7qZx
9pmK6cqBKmhdULp9RuicYUUG21HbAP6EAatzjR33KAgIlB1jpAfTEt+RqyRrAOdd
jYjBWnVVjjDySvABwBACewAnhpAKquEZupKAShAZtu8G3W2W7XTtZMkyW//6ELu1
sZojBoZ9M1TH7ENuG7vjLa7DVHd6qqtZyVFD8FjAN/yerfJm57t9K9h6HmZfwv1I
T3PCtytKwEytaxMTDBJuXen68LomszlEXl2KnHnSNoERpoN0NxQIj+4syDf65xTH
kJ5Ev2ZcGWOqMZNKbO+mxJYX5r4uk8GcugtD5I3rIVX8sZNKrQFzpFnBAgMBAAEw
DQYJKoZIhvcNAQEFBQADgYEAKSut5ZyFcEDl4SSUKsnEXV1Z4sfWk1WTnZP8D8qX
L/Mge0Gx36my6OtdJ0JFA1mO9gR3KyS9CDh3OgwWCg9HtoArriqLhBHE0oy7NYa2
uRFraeLO5fGKk6FKePb3DRF8i9tFMQBhoVAZhX8f6hw+g3Xt5fDAHMumG2qMeuMQ
l4I=
CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRD3GmedALZpDCXQ78C2Ehn0R+F7jn
4cbOTOHOBKGbFEb25Is7kHWQfB4AbOgXLs/S6x8DgFHNKr5iIoHiJerSIeGRTJtL
NnJsXfn7c9OZtBwmR3euiQO/evP7HSJZvel4rhb+8pRMf2MAxBC0D6z56iblnULJ
aohqjDPv9D38g7RI7YVurK05fjwnwB21/GRYh+vm5qdw78N+CTMP2rY5IHj4MJcx
qNpJbgMWZ8vDUY1Uf9JNQbrl1lKYeDFzhE3j+1uAPV711srJLvCUqoXPbfS1KKAJ
AJQcheBzd4Ul6wWULBCMLGPw3j6xOoBz6iKwAn+qOQgro2QQpidj/gkFAgMBAAEw
DQYJKoZIhvcNAQELBQADgYEAXopA8nlbYxyKoJeNXKX/+sWtbqYxzfxVo/6iOFMX
3ZSggFFMKCw7pEVgXy4nONNR98C4ga74lo6ljUY+B3xGQxEDYwK1xVgekA2XfQYJ
/ygAdoliF8BEkQ8b9ZoIwmBAIZRQO9b0DzucycvCag7km0O2uWJYQGzFIOQCxJ+v
9r0=
-----END CERTIFICATE-----
26 changes: 13 additions & 13 deletions tests/ssl/ca/client.csr
Expand Up @@ -2,17 +2,17 @@
MIIC+DCCAeACAQAwgY8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEQMA4GA1UE
BwwHT2FrbGFuZDEQMA4GA1UECgwHcmVxdWVzdDEaMBgGA1UECwwRcmVxdWVzdEBs
b2NhbGhvc3QxEzARBgNVBAMMClRlc3RDbGllbnQxHjAcBgkqhkiG9w0BCQEWD2Rv
Lm5vdEBlbWFpbC5tZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANhK
SviWyzGiXjLRD/WaP1LUUBnupnH2mYrpyoEqaF1Qun1G6JxhRQbbUdsA/oQBq3ON
HfcoCAiUHWOkB9MS35GrJGsA512NiMFadVWOMPJK8AHAEAJ7ACeGkAqq4Rm6koBK
EBm27wbdbZbtdO1kyTJb//oQu7WxmiMGhn0zVMfsQ24bu+MtrsNUd3qqq1nJUUPw
WMA3/J6t8mbnu30r2HoeZl/C/UhPc8K3K0rATK1rExMMEm5d6frwuiazOUReXYqc
edI2gRGmg3Q3FAiP7izIN/rnFMeQnkS/ZlwZY6oxk0ps76bElhfmvi6TwZy6C0Pk
jeshVfyxk0qtAXOkWcECAwEAAaAjMCEGCSqGSIb3DQEJBzEUDBJwYXNzd29yZCBj
aGFsbGVuZ2UwDQYJKoZIhvcNAQELBQADggEBAADv7KZq1ZxniXFe2SgWbvsvmsLA
5C/8SLH7MB9EQkDGQmyG5nsX98BQtNUR+rXvvXd/1piFBfZD6K/iy26N0ltDxt3H
JLKnWSbJctEKR+A9Nff1NPQsVlWSXEnXyRHqv8+pJlV0o1yl3TtSmTlL6fgVe0Ii
8D8w9QDTX3VT6M53BQtVaXJCpN6B943RvOeeKhOa/zyq0QU2a8+Tqm05qXHGQPCx
ZkcGH861tuQuR/UyPEJLpSpMdVUsstWLuOlpontVZO1pa4kRaWzKONzfDrfX+g58
tLFyrEl2vRni2tRdQHEXAPs5zvbGQ5wHouF8kp5cvQDmH4HYZAdV2ZSyOlQ=
Lm5vdEBlbWFpbC5tZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEP
caZ50AtmkMJdDvwLYSGfRH4XuOfhxs5M4c4EoZsURvbkizuQdZB8HgBs6Bcuz9Lr
HwOAUc0qvmIigeIl6tIh4ZFMm0s2cmxd+ftz05m0HCZHd66JA7968/sdIlm96Xiu
Fv7ylEx/YwDEELQPrPnqJuWdQslqiGqMM+/0PfyDtEjthW6srTl+PCfAHbX8ZFiH
6+bmp3Dvw34JMw/atjkgePgwlzGo2kluAxZny8NRjVR/0k1BuuXWUph4MXOETeP7
W4A9XvXWysku8JSqhc9t9LUooAkAlByF4HN3hSXrBZQsEIwsY/DePrE6gHPqIrAC
f6o5CCujZBCmJ2P+CQUCAwEAAaAjMCEGCSqGSIb3DQEJBzEUDBJwYXNzd29yZCBj
aGFsbGVuZ2UwDQYJKoZIhvcNAQELBQADggEBAIVRC0Ct5EETEdbCZRrd2/F7Ujkp
1y7M9diKeXEN+3OuGDuStPe6DM/nO4wz++JBB+NzKAfbr/bMEFnS8wbRFsxGY287
HyqAYAG8JZZpkcMnr2aXgdcT0YpCuGYh23+r18b34L2050Wmc/C1tJtxj0hAt4qg
Vr1HJQ67V4d2w3BIzq8wTmvBD//ofwydweYXWd7F1zcLgO36HcA8Na4eko6m0dpw
jRbxD1hyrXGkC1CkD43TnZWkIpARXtWzv2G9iaUGyVsVvRrAyts8+ZRu1SGNfdkG
HmBqEzn8mMBc92OYO2OGf/CkueSPivJ0JrbxWKktjytpsBUWwnwBsO/vwDQ=
-----END CERTIFICATE REQUEST-----
50 changes: 25 additions & 25 deletions tests/ssl/ca/client.key
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
24 changes: 12 additions & 12 deletions tests/ssl/ca/localhost.crt
@@ -1,20 +1,20 @@
-----BEGIN CERTIFICATE-----
MIIDLTCCApYCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC
MIIDLTCCApYCCQCt9iAWqkDJxDANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1
ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG
A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n
ZXJzLmNvbTAeFw0xNTA4MDMxNjM5NThaFw0xODA4MDIxNjM5NThaMIGOMQswCQYD
ZXJzLmNvbTAeFw0xODA3MDgxMTQ5MjlaFw0yMTA3MDcxMTQ5MjlaMIGOMQswCQYD
VQQGEwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB09ha2xhbmQxEDAOBgNVBAoM
B3JlcXVlc3QxGjAYBgNVBAsMEXJlcXVlc3RAbG9jYWxob3N0MRIwEAYDVQQDDAls
b2NhbGhvc3QxHjAcBgkqhkiG9w0BCQEWD2RvLm5vdEBlbWFpbC5tZTCCASIwDQYJ
KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5d+ffEqcykWv/O6OLvsdv3y2h/jK2R
lE4SSgqhCoS2J4X08B6LGHOs+IcMOtGV29dLy/wnMKdqVc/CqGd0KB6zkVERWt0H
mcoT3ATeIcs8kyO+i++LQB+5YNcSbmXZE4he/OoMWLJwLFzbCzSHCZGdutnAO8pl
dV1AWMKYncpDQjxVOL2Ji2sgJFa8Jfl2c6bzpYJxHrW+bdWhq7QjIqM4TtcRkmW4
NGMmf2sNnTC5pvI6/bFvQSSgYQ5ZjR6ytvFxeyo0cwyW5azTdgkRzXHan2m2Dh4b
kcLu9ReRVuJ6P6fATrUQD91mM85Bb8Qzn+L3rOKSuAcmgx8wrTHyjeUCAwEAATAN
BgkqhkiG9w0BAQUFAAOBgQAFhiBnCVsgk3Gn8kqKoAMqEd4Ckk3w6Fuj+C468lDM
HGrX6e1pPO8UwVNUye1U2nRkVmO92IPsENrnLvIoqbtXR4w6T0DWg+ilRgJsV/Ra
hVZBJxYthAtvyfNBnwd9FV3jC3waEsKRcnLDDkkBOfYtMeUzHuCBAwf5c7vuNC+N
xQ==
KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoTEIRDVlcBLaEggfE4eosRFjLhc0sg
a3NlLC/67T6hAN2/xbH1yCQpvrq0Xgi5FMXFp0rkFqcLSOEQ4mQH/wFtbj5+IbTj
eZvv2d7G5J+3hY7ALCDoMlwb0ifX8w5qMwPaiGdk7l0Wp/M81IALyVyKrKwlOVqT
ti/2hmhQBHGVLITso/QaGJenCnJ7tkZ6nFYYps0b2sl863jHnmaeY/QYGdCH+Nqn
n6nyuRfLekjboUfRAIqMfxarwVRxBVg4N9YLvT+Qm0U4ZtCCuMXRaKC5YRp5sK/7
GSngACB3En3ndP71ry6sxwova3Yb4Qeei1S/JonIr+KDTlmko8SXtnkCAwEAATAN
BgkqhkiG9w0BAQsFAAOBgQCpn2KTeSNsI95wVwDaXS4zkb4FtsFdG4368Bt0tKSc
HUlv8OL+h+gJOSfap+0WbY/cBMzGym+mS8MZFXYpDEmknyuSv+Rqs3DEP5nkBZWb
HaaIv1UrUF6XHh/C6kToNXRjZQCKYu2TWiqeA1psdBZBMJPwnvKiG+FKr+fZUAEv
Ug==
-----END CERTIFICATE-----
26 changes: 13 additions & 13 deletions tests/ssl/ca/localhost.csr
Expand Up @@ -2,17 +2,17 @@
MIIC9zCCAd8CAQAwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEQMA4GA1UE
BwwHT2FrbGFuZDEQMA4GA1UECgwHcmVxdWVzdDEaMBgGA1UECwwRcmVxdWVzdEBs
b2NhbGhvc3QxEjAQBgNVBAMMCWxvY2FsaG9zdDEeMBwGCSqGSIb3DQEJARYPZG8u
bm90QGVtYWlsLm1lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArl35
98SpzKRa/87o4u+x2/fLaH+MrZGUThJKCqEKhLYnhfTwHosYc6z4hww60ZXb10vL
/Ccwp2pVz8KoZ3QoHrORURFa3QeZyhPcBN4hyzyTI76L74tAH7lg1xJuZdkTiF78
6gxYsnAsXNsLNIcJkZ262cA7ymV1XUBYwpidykNCPFU4vYmLayAkVrwl+XZzpvOl
gnEetb5t1aGrtCMiozhO1xGSZbg0YyZ/aw2dMLmm8jr9sW9BJKBhDlmNHrK28XF7
KjRzDJblrNN2CRHNcdqfabYOHhuRwu71F5FW4no/p8BOtRAP3WYzzkFvxDOf4ves
4pK4ByaDHzCtMfKN5QIDAQABoCMwIQYJKoZIhvcNAQkHMRQMEnBhc3N3b3JkIGNo
YWxsZW5nZTANBgkqhkiG9w0BAQsFAAOCAQEAZhCYjPuSzKGqXGR+OcbCU+m8VmHA
FpBp04VEYxtStagi+m2m7JUDOsTm+NdMj7lBTMEX5eK6sLadeZjkwS7bZNSiq54b
2g5Yqom29LTQCKACBra+9iH3Y4CUIO0zxmki9QMlMBt5gU9DJEr4m9qk216s1hn+
FNZ5ytU6756y3eYnGOvJSUfhTKj+AWzljgRtgOsaEhnP/299LTjXrsLirO/5bbm8
f7qes5FtNWBYlRYx3nejouiquVZVmPYSi663dESLp/R35qV0Bg1Tam+9zGGysTuY
A8IYVUSqik3cpj6Kfu6UBv9KACWeKznjFrvz4dKrDho4YS/K4Zi3cqbEfA==
bm90QGVtYWlsLm1lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqhMQ
hENWVwEtoSCB8Th6ixEWMuFzSyBrc2UsL/rtPqEA3b/FsfXIJCm+urReCLkUxcWn
SuQWpwtI4RDiZAf/AW1uPn4htON5m+/Z3sbkn7eFjsAsIOgyXBvSJ9fzDmozA9qI
Z2TuXRan8zzUgAvJXIqsrCU5WpO2L/aGaFAEcZUshOyj9BoYl6cKcnu2RnqcVhim
zRvayXzreMeeZp5j9BgZ0If42qefqfK5F8t6SNuhR9EAiox/FqvBVHEFWDg31gu9
P5CbRThm0IK4xdFooLlhGnmwr/sZKeAAIHcSfed0/vWvLqzHCi9rdhvhB56LVL8m
iciv4oNOWaSjxJe2eQIDAQABoCMwIQYJKoZIhvcNAQkHMRQMEnBhc3N3b3JkIGNo
YWxsZW5nZTANBgkqhkiG9w0BAQsFAAOCAQEAW/XOubJr04gbdTAkBLjpsYthwOzd
uaX9V8K/tTa8bHKSLGN1AMLAVXu8LTfak8JoWXpGrHlFzvnzZZWMUeUAyaG97fBd
ewnmainh6auACjH8iK1/iRot0D9rvW+32kUyAK9p3mgtRraELiIWMcPZ9eWndZc/
qRm3S4tPsSSqPLPZNI9BeJ6u7eSGvC0LjdoP5usyNvd+GCO9ZXozBpUfVqV6LULc
D1mMSh08V9/54UcGVDoG5A+BZJx0Eq9ALirJnFXj96lpVc1VRQ4R7tRA+qFaJr7R
017go+qy2ZS7SMoTB2eA6M7eitfurQaBcBntPzAqq6nkRNOekzSYYFtYvg==
-----END CERTIFICATE REQUEST-----

0 comments on commit e9797e7

Please sign in to comment.