From 0978e200cf391711d321144b560d697b79ac5bd7 Mon Sep 17 00:00:00 2001 From: TeoV Date: Thu, 20 Aug 2020 12:48:10 +0300 Subject: [PATCH] Update tests to work with go 1.15 --- .travis.yml | 2 +- data/tls/ca.crt | 45 +++++++++++++------------- data/tls/client.crt | 40 ++++++++++++------------ data/tls/client.key | 52 +++++++++++++++---------------- data/tls/generate_certificate.sh | 6 ++-- data/tls/server.crt | 40 ++++++++++++------------ data/tls/server.key | 52 +++++++++++++++---------------- general_tests/sentinel_it_test.go | 3 +- go.mod | 2 +- utils/apitpdata_test.go | 8 ++--- utils/basic_auth_test.go | 2 +- utils/dataconverter_test.go | 4 +-- 12 files changed, 129 insertions(+), 127 deletions(-) diff --git a/.travis.yml b/.travis.yml index 099f91188..8d00edf27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.14 + - 1.15 script: go test -v ./... diff --git a/data/tls/ca.crt b/data/tls/ca.crt index 01c2bc177..6b305bf74 100644 --- a/data/tls/ca.crt +++ b/data/tls/ca.crt @@ -1,24 +1,25 @@ -----BEGIN CERTIFICATE----- -MIID/TCCAuWgAwIBAgIJAKzSW6RyuAFVMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD -VQQGEwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5o -YWxsMREwDwYDVQQKDAhJVHN5c0NPTTENMAsGA1UECwwEcm9vdDESMBAGA1UEAwwJ -bG9jYWxob3N0MSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29tLmNvbTAe -Fw0xODEwMjMwNzU0NDRaFw0yODEwMjAwNzU0NDRaMIGUMQswCQYDVQQGEwJERTEQ -MA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5oYWxsMREwDwYD -VQQKDAhJVHN5c0NPTTENMAsGA1UECwwEcm9vdDESMBAGA1UEAwwJbG9jYWxob3N0 -MSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29tLmNvbTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALeVxB0UL+mGF4eud8kKtCRo1c1k6RdmSkkL -sfNg8moo1hIZqEB9l6OylWl46ArCRfO2Q1Oa+7B4tiZZm/F/Y4jnBKuX/2NZcDNE -fLS6cOT0AFkXnyURg5vrF65SQ0MJsFBYe6qf0zZE+XngnkIJWEqdNl6ru6GoQrsr -tGRoR7VhcNxdybp1UqbSlWpLsXWMZEyL2k5XzQRArosLBEPrhwCsDOgnIRTuiWGS -95EtI5BcDH5UdQJS/bCK62I2Dufe7iTkymi30eQUOCu7wT7Q01eB5stQXXYjsZ7R -9OjdSXLMOluWs3o9wa9nB7ppOTkjX6tnVo5OdZ/P8vnn56/UtTsCAwEAAaNQME4w -HQYDVR0OBBYEFJFnvveUpV6TXiAnG0lGeEvr73qKMB8GA1UdIwQYMBaAFJFnvveU -pV6TXiAnG0lGeEvr73qKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AHMfoyJyheAyEsBX4jW0MAMg8BBx5m63JeTBOnbzXOI5z+sHg+7v8HjbxKd7DmED -Q6ayOayrKZt07Xfk6USwp/cZQFQAzSi1Fc0SL8S2rfy7LMOS04LfNymTeq+7SAO+ -xkaNKEd49grbfhZHt4bhLQ+JXXMIhGw/fnokHe4ebTZ8lrE0QQhRGBhO0cQqm78U -UlFKT3/NEoasvCDK3XcvPwpD1ucZ3JOiL66DbDR1XMRCGylDvJasUPGYEaytdaO6 -0UtK/Fwm8N4TFbkxzejDieB9QpKiL5fmN7jRKVBEGEU/9SmSj19psWIk3sCE4KW/ -LHFJFuru0lw/b9KnWcLoetk= +MIIEITCCAwmgAwIBAgIUA84jP36eRKSIEyEPbM2bQ9W2wWMwDQYJKoZIhvcNAQEL +BQAwgZQxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMRgwFgYDVQQHDA9C +YWQgUmVpY2hlbmhhbGwxETAPBgNVBAoMCElUc3lzQ09NMQ0wCwYDVQQLDARyb290 +MRIwEAYDVQQDDAlsb2NhbGhvc3QxIzAhBgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRz +eXNjb20uY29tMB4XDTIwMDgyMDA5MTczMVoXDTMwMDgxODA5MTczMVowgZQxCzAJ +BgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMRgwFgYDVQQHDA9CYWQgUmVpY2hl +bmhhbGwxETAPBgNVBAoMCElUc3lzQ09NMQ0wCwYDVQQLDARyb290MRIwEAYDVQQD +DAlsb2NhbGhvc3QxIzAhBgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRzeXNjb20uY29t +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzRI7KnqGGms9K/cgjTT1 +u53+WiDGGJymVz5cjhbRv1dx/4LqDvUeGaGvDZb0ZTqjT3Hlqp8r93AwLjTXTCj3 +NevSK/uqYPAQ2Tq4jf/IVyU2Ya8EuXIrktk2R12eMauPOpnUu5Nyt+5mvE3fCIgj +Tk/atrREKPBfOF7Jm/G1yLjHCXm6BqiR+lpX4EQACXXY+6de2Cko/TuvwMT76I5i +quojueROHNMKsKUMT3Id+cMXKLcVzwKqEUqIF5I8bP9XQnd4jYoifrX2UMiZpzvk +DDCOHmI75QO0RnuT5ebSYO6W1DkrbE2vrFvS8cT5cEIN7+TnnR9/vFxBUM9k4vFY ++QIDAQABo2kwZzAdBgNVHQ4EFgQURQMa81J1PEbeaI+VV/QXVoRhtJowHwYDVR0j +BBgwFoAURQMa81J1PEbeaI+VV/QXVoRhtJowDwYDVR0TAQH/BAUwAwEB/zAUBgNV +HREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggEBACGzLugP3l6zJ/iF +JTAz7yGGEz3eru2oeoHCRje+Pc86ZTu+sg6d7aop+nMdqtnUBthehuhZfUFp5TKQ +szh401kbS30rXLT8zz7Hf0rEJvZBkqGXOd5ZGYKvOBP4IrGLtUWDpLjQM9cwoUTY +51oYpagz8QKCwAvepeipzj/eoKiEu0XXMtn340iH+Q6XFhGLnhRCOgBMed3uXsq4 +bhLDX7iUF/c7769nkBu0gUloWKsTb3fLZvaSAjsIM8pAaRwNwn1UDw2K66V1e/YS +x0PP4uRZGnvUUks1roSvxqDKNxiZwEcc1hNnc7h25aRIJXzVbJqv1f8tZbbCFMV7 +eXpGWco= -----END CERTIFICATE----- diff --git a/data/tls/client.crt b/data/tls/client.crt index 2775d5b27..d2f5235ad 100644 --- a/data/tls/client.crt +++ b/data/tls/client.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDqDCCApACCQDPjpvIrCbmjTANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMC -REUxEDAOBgNVBAgMB0JhdmFyaWExGDAWBgNVBAcMD0JhZCBSZWljaGVuaGFsbDER -MA8GA1UECgwISVRzeXNDT00xDTALBgNVBAsMBHJvb3QxEjAQBgNVBAMMCWxvY2Fs -aG9zdDEjMCEGCSqGSIb3DQEJARYUY29udGFjdEBpdHN5c2NvbS5jb20wHhcNMTgx -MDIzMDc1NDQ1WhcNMjgxMDIwMDc1NDQ1WjCBljELMAkGA1UEBhMCREUxEDAOBgNV -BAgMB0JhdmFyaWExGDAWBgNVBAcMD0JhZCBSZWljaGVuaGFsbDERMA8GA1UECgwI -SVRzeXNDT00xDzANBgNVBAsMBmNsaWVudDESMBAGA1UEAwwJbG9jYWxob3N0MSMw -IQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29tLmNvbTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAL1OZEFRnQakuK3R5fNu9oQg3yaYgwjYtVQ2N6qO -X3d0Ts2MJmac02GRGgEs8K/mKO4WuCk9lwSaky7sMzogQ8yQdSCMO2/BhB6YIq9T -77toZZrrnoirDS9rdDHsiuZHPWv/bZySrsNXvOn2F0TQcod7YYy/gXZHR8sy9ZyS -f/Ohpjvnximc3Vxa0OtxWLwpcFZ1IJQupfRgIZ5ZYgw3FDx7QZvGdgcpfZhgZEdy -Pd05EjzZp40SIBd16zsJmptUjeapIOPVKZicRPE5HD0z6S2BAEUq03eZEOa476pp -VV2A82XxELgD5f6YLWo0Dz643nifzEslrXaAeef4e5CEcz0CAwEAATANBgkqhkiG -9w0BAQsFAAOCAQEAqCzoyjob3vRXD+o11E25DPTaeQnsE8F717s0A4UnTz97nh3M -ba5RDXgt8ZAZIks0MKz/9DXtFREkzU023o+raSnPKbukYkm75w46hBF36p7C0Wz2 -/fBJbGDovXISESsAXBxwJ8HEOarY9G8PGrfNeLJgXRXlJHY7HKW1Fsz6TyNYOYzs -nWNvYmwVKPPCWB2Zj0bCwcalKs7DvGkdWEtkH63Jn5pucAh84T8lpHlNA933ZXkh -sh+mzd136xaH1JsDQkB+mE8mmy/W57Ny/wDH300/2uqPk/lTVk3E2UBWmSUMHh/i -4H2NdNYao9PskcD0f7qnqFic267AvHcqaOwxLg== +MIIDszCCApsCFHZWDZSmmd07G5GX2MiQx863CEKgMA0GCSqGSIb3DQEBCwUAMIGU +MQswCQYDVQQGEwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJl +aWNoZW5oYWxsMREwDwYDVQQKDAhJVHN5c0NPTTENMAsGA1UECwwEcm9vdDESMBAG +A1UEAwwJbG9jYWxob3N0MSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29t +LmNvbTAeFw0yMDA4MjAwOTE3MzFaFw0zMDA4MTgwOTE3MzFaMIGWMQswCQYDVQQG +EwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5oYWxs +MREwDwYDVQQKDAhJVHN5c0NPTTEPMA0GA1UECwwGY2xpZW50MRIwEAYDVQQDDAls +b2NhbGhvc3QxIzAhBgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRzeXNjb20uY29tMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0np4rlXg6yeH5ZUOKHyyY2b/ +fntvs+U2XcQRI5g5zdLQpMgztl9sog/TQuY2RaeSvFT7KwTBX9u7SykNMeAkd86L +h0nwWC0hyVWthTq5z71JV1EsQwbgrDCxP//3CbQ36MBTb3KO9YM3MFA2cK2MtVm+ +/t8nj9sTTh7cx7pBChCCABhpVJHcTS7TdAU1tuIZn5dLk5WhZoeHB+AlX5yWiZYe +MrekVCoVa4FX6VMDotrczkVZDzG0bkPIMg2y4ndtfg+w5VaTgelj7sWOBR/+IRaH +5Z+8/s/+gO5Aa/pJVSGEAAgGVNFPnFlT+fOBfs/I1BdYncCg6Z26TcBprqbBAQID +AQABMA0GCSqGSIb3DQEBCwUAA4IBAQCMksWB/p4/aSTpAzWfHf4u7HBCDPqRmYW4 +KfW5Q1QPtP1VdVLCZAE5Hg85RoTtwucsGCME2+KqDXSlMcSNWIHz7yCz0YvVZ2if +xaP3nzcHayP+yRRy33NYk61aZWomcSTTH4MP0iXOwhwACoiLGXK47Ov5Heu/WdCU +bTBN0tZf/gL5W5xsMLIP+5hX2cKu9ZX7ETBr3EiBTg4EQ3zV1dELjUv9J59DUADk +0gnWxUxmZKGxM3YmntUvCF/ETe9UzKmDqSGRVGSmnPt0G+w35qTVDW4XOF55aMe0 +Ixhz5+4KL682li+Rcs8opP6KzlJNaGj5WzRm2w0cgO4aFr5yy4Mc -----END CERTIFICATE----- diff --git a/data/tls/client.key b/data/tls/client.key index 7c5207565..d150468d4 100644 --- a/data/tls/client.key +++ b/data/tls/client.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9TmRBUZ0GpLit -0eXzbvaEIN8mmIMI2LVUNjeqjl93dE7NjCZmnNNhkRoBLPCv5ijuFrgpPZcEmpMu -7DM6IEPMkHUgjDtvwYQemCKvU++7aGWa656Iqw0va3Qx7IrmRz1r/22ckq7DV7zp -9hdE0HKHe2GMv4F2R0fLMvWckn/zoaY758YpnN1cWtDrcVi8KXBWdSCULqX0YCGe -WWIMNxQ8e0GbxnYHKX2YYGRHcj3dORI82aeNEiAXdes7CZqbVI3mqSDj1SmYnETx -ORw9M+ktgQBFKtN3mRDmuO+qaVVdgPNl8RC4A+X+mC1qNA8+uN54n8xLJa12gHnn -+HuQhHM9AgMBAAECggEAW2tdDRI9s7SenwqLcwj2MY6yVTA3r3D/+IAKV+pTfhuD -5s20yb8YcbiiB0lNnpSW1YvROdFNeeKwC2vzvTFRrJtihOpT1b9tb1zm+yac0jMz -RiJdOADq6CiLP4TM+zISHnKG26MWlK1tRMscJ5ZGiNjzngXpnlYD/MRKSmeRNPTZ -64RTztXzfso4FA3vs8YB9ZbYTsdW+EK1cVsFee2ZqkZBv6zrP+xv7+8UYppBbgj4 -Tac3SCjRxYwkPOIlfl3fHnP6ZrwW5jxMtWhI59xAK2Kccpks7xOH4v6rW/VJQXPT -ifYhb2KOXhL9rNSU9h5NNr5GikLDGCzQ5XGWg/Bi4QKBgQDf/okcRSj1zRQ+xXNv -STAol+3akINsgBsOVX93MHwEsRgIHkNR+im/6gSV3AaP68ydVYWLuTLGfWxEU8ed -gstRE8Pr6eNmthnwSW3DJkNWL4I8bF7dearsQoyLN5WfkzQEWdh3djt6r0MXRMU2 -5cs+rW7iAUHZTnqIxSX19fobeQKBgQDYWwE+jcBt5CUVqziY+gy4OKEX8aqMCQID -nb8pSZlmFCLcxyN1vXT/BuGn63v0JpyjcOvvP2UhRNTwgrIWVBk2gxEjUiwVe/Vq -4KZnfpRMPCaUPjdXrWlNZWiT5FSw8Gn22sYTBTsULmBCUfeo0gneCTxXnpvaNx4T -/w7lfcDg5QKBgCOuoJjoS4YcjUUSnzjzJ8DPswxGSSlXnvfBlvSdvKPisjlY2NCO -UWhJF0HoMwNqRMYrgYKolfYYtM6NqhblZw4bX/KM57TM/YTRrbKQvdlU6CJIATS2 -1Qud7lWfHS62fGrVBS7CnucEVGO4iNId+Sqa5jcKjDrZzZtMDKgJ7zXBAoGBALoG -1bURcOmMBw7wn8N5DMLBflH2KuwpOqAdXKaFb+5DVg5681RjSFuXcSNO6M9u+7PU -fijCW5QVePorhjCIsv0aCPxTxS/b25LAApRuU9iQx6MjM7ahli9ECH1REDjrHlFw -nmrwTnH1xjKAA/AWWQGe81FrQRqJ1cTfw9EzJUq5AoGBAKG0pNr6QCuqLIivYzsZ -jI182BcElOUykVFbkjiD4t/X2kfa1iICRTSKzMZTpMEa8UKScruoVA+u5rmOlGeh -o8Mf2B97dkRG3mBq6lS9WooiNkxX5/HYIn79eh2hNdYgFxIqNkMnGYjIgKIx/WZQ -1jbFm82iOdim39an60MwRpl6 +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDSeniuVeDrJ4fl +lQ4ofLJjZv9+e2+z5TZdxBEjmDnN0tCkyDO2X2yiD9NC5jZFp5K8VPsrBMFf27tL +KQ0x4CR3zouHSfBYLSHJVa2FOrnPvUlXUSxDBuCsMLE///cJtDfowFNvco71gzcw +UDZwrYy1Wb7+3yeP2xNOHtzHukEKEIIAGGlUkdxNLtN0BTW24hmfl0uTlaFmh4cH +4CVfnJaJlh4yt6RUKhVrgVfpUwOi2tzORVkPMbRuQ8gyDbLid21+D7DlVpOB6WPu +xY4FH/4hFofln7z+z/6A7kBr+klVIYQACAZU0U+cWVP584F+z8jUF1idwKDpnbpN +wGmupsEBAgMBAAECggEAbTrHxFmnFwJ14Sxgo5xLC5EZSK+QgcCTXUfySRGn9evR +AaMwSxXsj5I85fwI8E8NtJU5n9Kg9DlZUqEkStzysAZNnNE/XNNXNGA1Y+3dHjUy +iZEDsmkwUcwXQIp6zttrJGwjILRIAputGXKXPhSi8D56A1UV9+8Obr1PgItlU23a +rWb38vIz600N2wr6N/nBi5PrW6P+zMzpoAEPb3uRJq4HUDx55r5Lco6dmKEFsBBw +KD6Yl2RknuSteGO8KI0nw09uVPI3ApQUNhy/oTgCLp4GNXRr+wrnHm8GquE7LllM +rZULE7jLZuG6QGzQzbWI5XfMVKhbU5TtWpnj4QylXQKBgQDvbb50KGyxFFVGvcag +rb70kSwwhtPEh+cMi2EDRQqclgfhpJ30XEWQtTFPckXv2FEVgo/GIbPefCk586sU +tTGu1s2j6oDlk6e472W3LSXH35pSNfd7tg7EmmCkfMfDxAqdaGqT2vuyHwkiRbE6 +2TrOxep0XOmXB/nx/DWODPo3uwKBgQDhC8d81O++TYyXuR77YV5iutfF6l8TTmeW +HGbuQP7TpQ4wCxKDXJ/sczd4rOT4oCr7ajfMpQeKqpCqjVlkqTta6ts4R5kj6Pq8 +PYwo9pW1bzXEG6ZJhdJwbGltGitsYItboU3phE4wW7oXFmzatqpmykEUmmflN8yW +My8s/beocwKBgETbqwp9FcVXs67EpXtQfLqZhbvvCrha3XgeHahzEro1685ZKZQ9 +dURI2AWhN7vi2m71PaQdzT0POEwSaAFsmv1NiZa6updL/9CQCRDFSzhQdnFuU96g +XV7thx3HRSxoFSVwAjbDo992TYotwOrLzr3o7aTJk+R7xsZxYnWYBd5BAoGALcis +tAvKHog+YxupXvEHN8TVYxF0eEQKNPLgSfZ1IW/B/Co0gP8WFg+2qFlcV+yV8gJB +CeRFLYPX3KrXFfCL/8oqAUAnurOKV0OaQTcxa/ENGjGZ2flcv7x+klCxpuHZWDHv +3OMq2RHAQTQxvylMb48UQHHNU0fP2nrdTSTs+VsCgYEAsoFm1K0OgJzfgcdUvXFo +NdHR/l1MXuKogSFVNSr/7Houaha/Jk5zDA+8GsRuN7LfTnoqqMRZ1cxpBJI7xGAR +X3rkq+1Q7pMK84JN3/qDN0sbLxqhjyNJkxDtLgLwD1AIeCL8wcYnBRvrXJzKu/+9 +PnKgm4WRUxZ2Bbq2J8rJHMw= -----END PRIVATE KEY----- diff --git a/data/tls/generate_certificate.sh b/data/tls/generate_certificate.sh index 7357c7e92..d1a6f06f1 100755 --- a/data/tls/generate_certificate.sh +++ b/data/tls/generate_certificate.sh @@ -1,16 +1,16 @@ #!/bin/sh # Generate self signed root CA cert -openssl req -nodes -x509 -newkey rsa:2048 -days 3650 -keyout ca.key -out ca.crt -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=root/CN=localhost/emailAddress=contact@itsyscom.com" +openssl req -nodes -x509 -newkey rsa:2048 -days 3650 -keyout ca.key -out ca.crt -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=root/CN=localhost/SAN=localhost/emailAddress=contact@itsyscom.com" -addext "subjectAltName = DNS:localhost" # Generate server cert to be signed -openssl req -nodes -newkey rsa:2048 -days 3650 -keyout server.key -out server.csr -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=server/CN=localhost/emailAddress=contact@itsyscom.com" +openssl req -nodes -newkey rsa:2048 -days 3650 -keyout server.key -out server.csr -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=server/CN=localhost/SAN=localhost/emailAddress=contact@itsyscom.com" -addext "subjectAltName = DNS:localhost" # Sign the server cert openssl x509 -req -in server.csr -days 3650 -CA ca.crt -CAkey ca.key -CAcreateserial -out server.crt # Generate client cert to be signed -openssl req -nodes -newkey rsa:2048 -days 3650 -keyout client.key -out client.csr -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=client/CN=localhost/emailAddress=contact@itsyscom.com" +openssl req -nodes -newkey rsa:2048 -days 3650 -keyout client.key -out client.csr -subj "/C=DE/ST=Bavaria/L=Bad Reichenhall/O=ITsysCOM/OU=client/CN=localhost/SAN=localhost/emailAddress=contact@itsyscom.com" -addext "subjectAltName = DNS:localhost" # Sign the client cert openssl x509 -req -in client.csr -days 3650 -CA ca.crt -CAkey ca.key -CAserial ca.srl -out client.crt diff --git a/data/tls/server.crt b/data/tls/server.crt index f0237baae..6a1481bb8 100644 --- a/data/tls/server.crt +++ b/data/tls/server.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDqDCCApACCQDPjpvIrCbmjDANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMC -REUxEDAOBgNVBAgMB0JhdmFyaWExGDAWBgNVBAcMD0JhZCBSZWljaGVuaGFsbDER -MA8GA1UECgwISVRzeXNDT00xDTALBgNVBAsMBHJvb3QxEjAQBgNVBAMMCWxvY2Fs -aG9zdDEjMCEGCSqGSIb3DQEJARYUY29udGFjdEBpdHN5c2NvbS5jb20wHhcNMTgx -MDIzMDc1NDQ0WhcNMjgxMDIwMDc1NDQ0WjCBljELMAkGA1UEBhMCREUxEDAOBgNV -BAgMB0JhdmFyaWExGDAWBgNVBAcMD0JhZCBSZWljaGVuaGFsbDERMA8GA1UECgwI -SVRzeXNDT00xDzANBgNVBAsMBnNlcnZlcjESMBAGA1UEAwwJbG9jYWxob3N0MSMw -IQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29tLmNvbTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBALdQ15Cmd8wPyiuhE2GFeOdhb2CdPFb6EYrHzVrJ -iEzrAv52SRp75xleFzVJ+jiAJQ00P6ladgEOKu46Sl+2s3KlK5f25QwbuSUzMPF2 -QF7HtJTsPaFDaIyVJnqPZz8ksTtijYzWCDU23F7LWAq75EsATI/2oeBtcu9vXxJi -q3YzHidhvW0GwsQkPPdyXzakDFqKUcbP1+S8eSI+uYSGy+Xf5C1j5c2jfbcsEev3 -zqKCQzed9ldPlkWd77z5IUsjnfAM276BLQnQ2RbMjtlWRKTS50eiB2sur5ttq89z -vYK757cnkL3nmAwOjPKVfbXjOi9TwVmceXZkDB+m2FMm5hcCAwEAATANBgkqhkiG -9w0BAQsFAAOCAQEAhkJpYysSG7RckAwa8Plx7lhI+l4tokOSafJOGy3228kCBpBc -8huESqtqlVn0+yYvE2Dtg14RY8GRGzSDocjHN8ZJYuDrMCz94OZljvhtIlrFAloK -38CsGZHaKqBV2u7hRoiGRyc+hLebQpIv6ruHkfg1RGERh4DnJtwzQ0fAxauk9MlA -WNm4t6YM6RSxwwUh1O68W4+j4dImNZ2kqFFLivP557Ntane6GKogfuO9uM2QZEDE -CfMouBymzO8m0Ze+hvy8rEqndQ+ocCc2KqzUiCmmex+1H3VEMc9GPoybPYUjR2TI -34h8vJYMonLsgl4E1l5EgfASbp4X9KILWlgMkg== +MIIDszCCApsCFHZWDZSmmd07G5GX2MiQx863CEKfMA0GCSqGSIb3DQEBCwUAMIGU +MQswCQYDVQQGEwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJl +aWNoZW5oYWxsMREwDwYDVQQKDAhJVHN5c0NPTTENMAsGA1UECwwEcm9vdDESMBAG +A1UEAwwJbG9jYWxob3N0MSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGl0c3lzY29t +LmNvbTAeFw0yMDA4MjAwOTE3MzFaFw0zMDA4MTgwOTE3MzFaMIGWMQswCQYDVQQG +EwJERTEQMA4GA1UECAwHQmF2YXJpYTEYMBYGA1UEBwwPQmFkIFJlaWNoZW5oYWxs +MREwDwYDVQQKDAhJVHN5c0NPTTEPMA0GA1UECwwGc2VydmVyMRIwEAYDVQQDDAls +b2NhbGhvc3QxIzAhBgkqhkiG9w0BCQEWFGNvbnRhY3RAaXRzeXNjb20uY29tMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs93rvR+AI0WKfJOwtlFPrZwr +vC1HnRUb2MbRmv6DwYPoGxD6SDllxc5QQHTOVi7K0GYHwo9ngOoJtGa7IExJ8IQ6 +nDoI2M5oEbEZMcs+DJNcOYaJ49DK2V3tb9rRhMFPuorQv2M0Oo53/4+IY4lOQeZH +XdjLSi+wVI0IOt9XgS+II/e1KKl8lsJou9hClPi3nq+ctpo7baFQ/S+LwI9JgSU/ +4LirsqWiUE5aSWA/SdDExoOiart8hhbW9rgK68LdeKdSUK4KUUBLyhWCqsFJ2Ce6 +g7v//Nf4usWqFxGV9CTsWheQM8omtKXX6lCgJyFyJz8jKIsRUP14kbphCjjjyQID +AQABMA0GCSqGSIb3DQEBCwUAA4IBAQCQh1LnZyWNV5mSx/Z5lkghdoA6kUCyoRka +V98tmNzp5P+JJw6xZSAutA1VLTX3bgvFNqXpl3sBHJp+C3fCbfZYsev1PqnD5qTX +bDfRGINkzpr/psD4fj8q85ly8AdtU/AL56ENdsjTCK9JzxPAAg6nfvQ/7SQ9di1j +EDYO0ANSU3iGrv5e/X2C9oLLgocOooHY9L3eAWaTfCEtBEyPFSm/d1POvpi/4AQe +Axty3ApmIrF/st8q2OKZcy2FSG1g7ltxGgrstexYG7nTHd2tbG2STA1bon5QczSq +sIq+G7yrepK67g6f9znyOH6EMgvMdVhQtpgdKAYjHh63URqDPva3 -----END CERTIFICATE----- diff --git a/data/tls/server.key b/data/tls/server.key index 9d17fb2c4..9ceac8105 100644 --- a/data/tls/server.key +++ b/data/tls/server.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3UNeQpnfMD8or -oRNhhXjnYW9gnTxW+hGKx81ayYhM6wL+dkkae+cZXhc1Sfo4gCUNND+pWnYBDiru -OkpftrNypSuX9uUMG7klMzDxdkBex7SU7D2hQ2iMlSZ6j2c/JLE7Yo2M1gg1Ntxe -y1gKu+RLAEyP9qHgbXLvb18SYqt2Mx4nYb1tBsLEJDz3cl82pAxailHGz9fkvHki -PrmEhsvl3+QtY+XNo323LBHr986igkM3nfZXT5ZFne+8+SFLI53wDNu+gS0J0NkW -zI7ZVkSk0udHogdrLq+bbavPc72Cu+e3J5C955gMDozylX214zovU8FZnHl2ZAwf -pthTJuYXAgMBAAECggEAE559U6fdTmOqOX0lu9wzEmBlMSvi11QwKHA11C+ZfNHy -IhW6wTDdjON7DGL8equMS5t57MAXvQktIw3uA8xj7DMtNThhTyhwakDOTilfvkUV -WJLoDahPOiyET72lSSa+KSLlD1ugyUEz2JletNdjGXvQtd+pd4F/OYzr2eXhf+bO -RdUGuHJWYrww5rC5EwYj29acthayk3vRWmPWegIITnJWMayiT+K03k3nJjBwF8bC -d9WG9u9CTlvePC8ccoQvXXtMClQ3Ino2Hl9okJmjzrQ6Q+2jdHPTddapUHV1gA0V -PG694FEk18tYOQrD8+c8yIhbPqNC3a7zATX3yh9XQQKBgQDbO+aBNo39HBiAVXEO -39yKXRftyIxkpCUC0lo0N0NGdaTlOBNPzDsrBAO1C9Eoy/wmocVqp86Jml6oWoEX -IqRCx+hg9SfL4GufE3T5ca6zlxGIj6NkTzeqOqI4rP9WyeJVXrtBQ47nsM9GH/uF -yWfdUYVTGnY3Xm3vCQM0Ev6NUQKBgQDWDukTR+EgkkWQSqRAXKXS8cAKCRatygfG -Fw7BF4T86rIaekjr+hIWE1bhuf0aL+n2YuTtC+jzpRvtO0sfogOhdwcm//EDez+v -OYXnA9xBZs9sSltdnOdUcindmJu/gQ8auKI+blZ05xoxkQOhsKdthKK2sj89wJdD -/Wt4cv7C5wKBgQCh9tnvQf+aK8SKIxVYeNg0vFvuRsg5ne7d68vKYb1o84bz9P6H -aImZ2OhoO6e1bSYG4GK5zelPTWV7GQnfrq8NyySJZPSWsWCw8C3uDyeS9Bt2+S8r -7z5fm9u25U/qrVFx4n+S0rdjwgMPepdWmpoKLqzB3X3SoAe1ncHpGdNHUQKBgQC8 -xxeMNnb3Z6hLsVgbntlrKGKpNwy2JZcnfow3hAt3lW+O5EtNORQcPeAAYCszng/i -h6LG3xsJTJJNbF47PoGfMz6uiUc/P8GRQdSyQHhNgWLqaMUc0NQ+aBQ95mlswV/V -vADxuBMtM+ao0e/297kgX7m0D4ywZBnDD0ppRlkg/wKBgBCmO6YNS8XL2cLGzHOi -EHSP3+XWDXsQLtqpHNxmeok1W04AkB1LehvPqC9BmhVUPpmgjBZA7mvjUO66bZSV -DMcyOm6EL5fBa8XW3O3P9+gsnNRp+xvgBSS4mDZU42L7SYYGOZoRw8Y2c6CXLBXq -UYBQMIWyoNJWQ9yzpCjfqnB8 +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz3eu9H4AjRYp8 +k7C2UU+tnCu8LUedFRvYxtGa/oPBg+gbEPpIOWXFzlBAdM5WLsrQZgfCj2eA6gm0 +ZrsgTEnwhDqcOgjYzmgRsRkxyz4Mk1w5honj0MrZXe1v2tGEwU+6itC/YzQ6jnf/ +j4hjiU5B5kdd2MtKL7BUjQg631eBL4gj97UoqXyWwmi72EKU+Leer5y2mjttoVD9 +L4vAj0mBJT/guKuypaJQTlpJYD9J0MTGg6Jqu3yGFtb2uArrwt14p1JQrgpRQEvK +FYKqwUnYJ7qDu//81/i6xaoXEZX0JOxaF5Azyia0pdfqUKAnIXInPyMoixFQ/XiR +umEKOOPJAgMBAAECggEAbSTE38Y1ozGXj3CvUnKUvux9PXrccd1VQH2kw0CeAtdg +CMyMkzcBIr7Gw9YdPv614y+GlfEfBYL+0JFmC3s/gss6JYKxy520WMf2WdjSlh71 +X5LcKXmRHcV5Rt6pNL14++EwOnKgRsgc2N7oDD5NVn+93pym/yVhAm1yCQdtud1x +FUxRlvTgG4ueG2FHjIhHmMWsAMzkANsQBu0cL88NIwITgdNODBmWrPo8XgUDatiS +64rwEhS+a1Z5t9w4nNzm3cndP7aIwFGAXvC25fqDMW5kl8OrNaOw+itF+zT9Fscj +fIqOo48NGDpYnmqh2eMi+OnPhJVSvrFh9Wyn0juwAQKBgQDiwfGlAQEzNUD6z9Pv +s86Y66DyCOvncIgIDOlLYZQNJBkFUurlxFx23pmdSxIqV3T93uv7a8l49ZYvvRbC +FZrBKX87oUtX/iF0ifm9kQv7CGDSrqEikJFfBKSG0caqFqgNQFCmkVBkX/qF7qPz +x5nxvKvyBhFta7Wn+PTqD6TcQQKBgQDLD/OVDUzHjMrAvQCmAzTOGONGKa8fAtI2 +Bpd/EJRcbxPO/+GMqwfnKodpJuCI7DRX5gJ9JYnUL2Vgu+9afl4OpQ08/W7mFphS +YYYuHVsF6mQ/L6NRPC7eUkwwkS6/6Z0/5QDhM3WVYIR8Gqfh2ejauAy538DQ1AB8 +JYa0oUHFiQKBgEGp6/HeQpyzlSeMO1E0fmUmBqtQDhAtNBcwtfYQQbE0fNJf2onC +vQvnFhDIhnAgd0502V0rL2KJq34TgZ2eZ/v7qk54PLs0aje3JMzSTefZ2z/nNd4u +gwpC6+nmoWLrwKplr3Usq10FtiRGoM+dQ2UPP7OMMku/XxFPNIz7DsCBAoGBAMJT +IJqqYKiyvrFV7hHxDY6R2KWjbHgz3fFfu4kY17HhhsZYr4NLhUOeunlRgBzoVmsr +rYQP8WeCd/TrxPIH7oD7SMDuEzvTsa9crujgpOPzXD3vm8441u1hOpJbza5QpXCo ++X+KHGN4OzD83V5Qh/sPmPYj/8SYrWIhE1k23NdpAoGAT0yVHDjRtlprww4eh+vc +hHEm1X3ay9OCDGXiEY2j+PXCSEFx2u5od5JfvKoON4O5BvNB5EehiqiY8/xm5p3p +GUf1VNvkih/51iGcpzNA/KcB863XQhghs3/s4bmJF7s6Jt7vbwUgBq5qFPn5ltLG +XeifXYvAJO+C50JjVTOm628= -----END PRIVATE KEY----- diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go index b97448e38..da813140f 100755 --- a/general_tests/sentinel_it_test.go +++ b/general_tests/sentinel_it_test.go @@ -27,6 +27,7 @@ import ( "os/exec" "path" "reflect" + "strconv" "testing" "github.com/cgrates/cgrates/config" @@ -189,7 +190,7 @@ func testRedisSentinelInsertion(t *testing.T) { index := 0 var result string addFunc := func(t *testing.T, nrFail *int) { - alsPrf.ID = orgiginID + string(index) + alsPrf.ID = orgiginID + strconv.Itoa(index) if err := sentinelRPC.Call(utils.APIerSv1SetAttributeProfile, alsPrf, &result); err != nil { if err.Error() == "SERVER_ERROR: EOF" { *nrFail = *nrFail + 1 diff --git a/go.mod b/go.mod index 8aafd9273..1577d2a53 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cgrates/cgrates -go 1.14 +go 1.15 // replace github.com/cgrates/radigo => ../radigo diff --git a/utils/apitpdata_test.go b/utils/apitpdata_test.go index 799f6e456..f71d537ea 100644 --- a/utils/apitpdata_test.go +++ b/utils/apitpdata_test.go @@ -111,7 +111,7 @@ func TestNewRateSlot(t *testing.T) { eOut.RateUnit = "a" rcv, err = NewRateSlot(eOut.ConnectFee, eOut.Rate, eOut.RateUnit, eOut.RateIncrement, eOut.GroupIntervalStart) //must receive from time an error: "invalid duration a" - if err == nil || err.Error() != "time: invalid duration a" { + if err == nil || err.Error() != "time: invalid duration \"a\"" { t.Error(err) } } @@ -128,19 +128,19 @@ func TestSetDurations(t *testing.T) { } rs.RateUnit = "a" //at RateUnit if, must receive from time an error: "invalid duration a" - if err := rs.SetDurations(); err == nil || err.Error() != "time: invalid duration a" { + if err := rs.SetDurations(); err == nil || err.Error() != "time: invalid duration \"a\"" { t.Error(err) } rs.RateUnit = "1" rs.RateIncrement = "a" //at RateIncrement, must receive from time an error: "invalid duration a" - if err := rs.SetDurations(); err == nil || err.Error() != "time: invalid duration a" { + if err := rs.SetDurations(); err == nil || err.Error() != "time: invalid duration \"a\"" { t.Error(err) } rs.RateIncrement = "1" rs.GroupIntervalStart = "a" //at GroupIntervalStart, must receive from time an error: "invalid duration a" - if err := rs.SetDurations(); err == nil || err.Error() != "time: invalid duration a" { + if err := rs.SetDurations(); err == nil || err.Error() != "time: invalid duration \"a\"" { t.Error(err) } } diff --git a/utils/basic_auth_test.go b/utils/basic_auth_test.go index 2ff3050cf..b2caa9c66 100644 --- a/utils/basic_auth_test.go +++ b/utils/basic_auth_test.go @@ -145,7 +145,7 @@ func TestVerifyCredential(t *testing.T) { {"foo", "bar", map[string]string{"test": "1234", "foo": hashedPasswords["bar"]}, true}, {"foo", "1234", map[string]string{"test": "1234", "foo": hashedPasswords["bar"]}, false}, {"none", "1234", map[string]string{"test": "1234", "foo": hashedPasswords["bar"]}, false}, - {"test", "1234", map[string]string{"test": "1234" + string(0), "foo": hashedPasswords["bar"]}, false}, + {"test", "1234", map[string]string{"test": "12340", "foo": hashedPasswords["bar"]}, false}, } for _, tt := range verifyCredentialTests { diff --git a/utils/dataconverter_test.go b/utils/dataconverter_test.go index 1e59dadce..c5c7fbeb5 100644 --- a/utils/dataconverter_test.go +++ b/utils/dataconverter_test.go @@ -188,14 +188,14 @@ func TestNewDurationSecondsConverter(t *testing.T) { func TestDurationSecondsConverterConvert(t *testing.T) { mS := &DurationSecondsConverter{} - if _, err := mS.Convert("string"); err.Error() != "time: invalid duration string" { + if _, err := mS.Convert("string"); err.Error() != "time: invalid duration \"string\"" { t.Error(err) } } func TestDurationNanosecondsConverterConvert(t *testing.T) { nS := &DurationNanosecondsConverter{} - if _, err := nS.Convert("string"); err.Error() != "time: invalid duration string" { + if _, err := nS.Convert("string"); err.Error() != "time: invalid duration \"string\"" { t.Error(err) } }