diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 861b585..f6a84ac 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,44 +1,33 @@ name: Tests -on: push +on: [push] jobs: - lint: - name: lint + tests: + name: Test suite runs-on: ubuntu-latest + strategy: + matrix: + go-version: ["1.25"] + steps: - - uses: actions/setup-go@v3 + - uses: actions/checkout@v5 + + - uses: actions/setup-go@v6 with: - go-version: 1.17 - - uses: actions/checkout@v3 + go-version: stable - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v9 with: - version: v1.29 - skip-cache: true - skip-build-cache: true + version: v2.6 - gosec: - name: security scanner - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - name: Run Gosec Security Scanner uses: securego/gosec@master with: args: ./... - - tests: - name: Test suite - runs-on: ubuntu-latest - - steps: - - uses: actions/setup-go@v3 - with: - go-version: 1.17 - - uses: actions/checkout@v3 + - name: Tests - run: go test -count=1 -timeout 240s -race -cover ./... - + run: go test -count=1 -timeout 240s -race -cover ./... + - name: Build lkgen run: cd lkgen && go build \ No newline at end of file diff --git a/LICENSE b/LICENSE index 3ea238f..d71fd4c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 Hyperboloide +Copyright (c) 2025 Frederic Delbos Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/examples_test.go b/examples_test.go index 556fb23..f13c222 100644 --- a/examples_test.go +++ b/examples_test.go @@ -19,7 +19,7 @@ func Example_complete() { // create a new Private key: privateKey, err := lk.NewPrivateKey() if err != nil { - log.Fatal(err) + log.Fatal("private key generation failed: " + err.Error()) } @@ -39,7 +39,7 @@ func Example_complete() { // generate your license with the private key and the document: license, err := lk.NewLicense(privateKey, docBytes) if err != nil { - log.Fatal(err) + log.Fatal("license generation failed: " + err.Error()) } @@ -47,7 +47,6 @@ func Example_complete() { str64, err := license.ToB64String() if err != nil { log.Fatal(err) - } fmt.Println(str64) @@ -57,7 +56,7 @@ func Example_complete() { // validate the license: if ok, err := license.Verify(publicKey); err != nil { - log.Fatal(err) + log.Fatal("license verification failed: " + err.Error()) } else if !ok { log.Fatal("Invalid license signature") } @@ -101,22 +100,24 @@ func Example_licenseGeneration() { // Unmarshal the private key: privateKey, err := lk.PrivateKeyFromB32String(privateKeyBase32) if err != nil { - log.Fatal(err) + log.Fatal("private key unmarshal failed: " + err.Error()) } // generate your license with the private key and the document: license, err := lk.NewLicense(privateKey, docBytes) if err != nil { - log.Fatal(err) - + log.Fatal("license generation failed: " + err.Error()) } + // the b32 representation of our license, this is what you give to // your customer. licenseB32, err := license.ToB32String() if err != nil { - log.Fatal(err) + log.Fatal("license encoding failed: " + err.Error()) } + + // print the license that you should give to your customer fmt.Println(licenseB32) } @@ -125,7 +126,7 @@ func Example_licenseGeneration() { func Example_licenseVerification() { // A previously generated licence b32 encoded. In real life you should read - // it from a file at the beginning of your program and check it + // it from a file (or prompt the user) at the beginning of your program and check it // before doing anything else... const licenseB32 = "FT7YOAYBAEDUY2LDMVXHGZIB76EAAAIDAECEIYLUMEAQUAABAFJAD74EAAAQCUYB76CAAAAABL7YGBIBAL7YMAAAAD73H74IAFEHWITFNVQWS3BCHIRHIZLTORAGK6DBNVYGYZJOMNXW2IRMEJSW4ZBCHIRDEMBRHAWTCMBNGI3FIMJSHIYTSORTGMXDOMBZG43TIMJYHAVTAMR2GAYCE7IBGEBAPXB37ROJCUOYBVG4LAL3MSNKJKPGIKNT564PYK5X542NH62V7TAUEYHGLEOPZHRBAPH7M4SC55OHAEYQEXMKGG3JPO6BSHTDF3T5H6T42VUD7YAJ3TY5AP5MDE5QW4ZYWMSAPEK24HZOUXQ3LJ5YY34XYPVXBUAA====" @@ -137,18 +138,18 @@ func Example_licenseVerification() { // Unmarshal the public key publicKey, err := lk.PublicKeyFromB32String(publicKeyBase32) if err != nil { - log.Fatal(err) + log.Fatal("public key unmarshal failed: " + err.Error()) } // Unmarshal the customer license: license, err := lk.LicenseFromB32String(licenseB32) if err != nil { - log.Fatal(err) + log.Fatal("license unmarshal failed: " + err.Error()) } // validate the license signature: if ok, err := license.Verify(publicKey); err != nil { - log.Fatal(err) + log.Fatal("license verification failed: " + err.Error()) } else if !ok { log.Fatal("Invalid license signature") } diff --git a/go.mod b/go.mod index ff80d90..160ed31 100644 --- a/go.mod +++ b/go.mod @@ -2,23 +2,16 @@ module github.com/hyperboloide/lk go 1.17 +require gopkg.in/alecthomas/kingpin.v2 v2.2.6 + require ( - github.com/dchest/uniuri v0.0.0-20220929095258-3027df40b6ce - github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.20.2 - gopkg.in/alecthomas/kingpin.v2 v2.2.6 + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect ) require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/google/go-cmp v0.5.8 // indirect - github.com/nxadm/tail v1.4.8 // indirect - golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect - golang.org/x/text v0.3.7 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect + github.com/stretchr/testify v1.11.1 gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 2a472a2..c30402a 100644 --- a/go.sum +++ b/go.sum @@ -2,146 +2,26 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dchest/uniuri v0.0.0-20220929095258-3027df40b6ce h1:uHEdbpdf5QdO6Koxr10tA+p85JPbLHzwG3+uGysF0WY= -github.com/dchest/uniuri v0.0.0-20220929095258-3027df40b6ce/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= -github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= -github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY= -github.com/onsi/gomega v1.20.2/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/keys.go b/keys.go index 6dab712..66f6fe2 100644 --- a/keys.go +++ b/keys.go @@ -7,7 +7,6 @@ import ( "encoding/base32" "encoding/base64" "encoding/hex" - "errors" "math/big" ) @@ -42,12 +41,13 @@ func (k *PrivateKey) toEcdsa() *ecdsa.PrivateKey { // ToBytes transforms the private key to a []byte. func (k PrivateKey) ToBytes() ([]byte, error) { ek := k.toEcdsa() + pubBytes, err := ek.PublicKey.Bytes() + if err != nil { + return nil, err + } c := &pkContainer{ - elliptic.Marshal( - ek.PublicKey.Curve, - ek.PublicKey.X, - ek.PublicKey.Y), - ek.D, + Pub: pubBytes, + D: ek.D, } return toBytes(c) @@ -145,9 +145,12 @@ func (k *PublicKey) toEcdsa() *ecdsa.PublicKey { // ToBytes transforms the public key to a []byte. func (k PublicKey) ToBytes() []byte { - // return toBytes(k) - ek := k.toEcdsa() - return elliptic.Marshal(ek.Curve, ek.X, ek.Y) + pkBytes, err := k.toEcdsa().Bytes() + if err != nil { + panic("lk: could not marshal public key: " + err.Error()) + } + + return pkBytes } // ToB64String transforms the public key to a base64 string. @@ -173,17 +176,11 @@ func (k PublicKey) ToHexString() string { // PublicKeyFromBytes returns a public key from a []byte. func PublicKeyFromBytes(b []byte) (*PublicKey, error) { - x, y := elliptic.Unmarshal(Curve(), b) - if x == nil { - return nil, errors.New("invalid key") - } - - k := ecdsa.PublicKey{ - Curve: Curve(), - X: x, - Y: y, + k, err := ecdsa.ParseUncompressedPublicKey(Curve(), b) + if err != nil { + return nil, err } - r := PublicKey(k) + r := PublicKey(*k) return &r, nil } diff --git a/keys_test.go b/keys_test.go index 3857d8f..1e3a559 100644 --- a/keys_test.go +++ b/keys_test.go @@ -1,126 +1,110 @@ package lk_test import ( - "crypto/rand" - - "github.com/dchest/uniuri" "github.com/hyperboloide/lk" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" ) -var _ = Describe("Keys", func() { - - var k *lk.PrivateKey - - BeforeEach(func() { - var err error - k, err = lk.NewPrivateKey() - Ω(err).To(BeNil()) - }) +func (s *Suite) TestKeys() { + k, err := lk.NewPrivateKey() + s.Require().NoError(err) - It("should test private key bytes", func() { + s.Run("should test private key bytes", func() { b, err := k.ToBytes() - Ω(err).To(BeNil()) + s.Require().NoError(err) k1, err := lk.PrivateKeyFromBytes(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k)) + s.Require().NoError(err) + s.Require().Equal(k1, k) - invalidBytes := make([]byte, 42) - _, err = rand.Read(invalidBytes) - Ω(err).To(BeNil()) + invalidBytes := s.RandomBytes(42) k2, err := lk.PrivateKeyFromBytes(invalidBytes) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) - }) - - It("should test private key b64", func() { - b, err := k.ToB64String() - Ω(err).To(BeNil()) - k1, err := lk.PrivateKeyFromB64String(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k)) - - invalidB64Str := uniuri.NewLen(42) - k2, err := lk.PrivateKeyFromB64String(invalidB64Str) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) - }) - - It("should test private key b32", func() { - b, err := k.ToB32String() - Ω(err).To(BeNil()) - k1, err := lk.PrivateKeyFromB32String(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k)) - - invalidB32Str := uniuri.NewLen(42) - k2, err := lk.PrivateKeyFromB32String(invalidB32Str) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) - }) - - It("should test private key hex", func() { - b, err := k.ToHexString() - Ω(err).To(BeNil()) - k1, err := lk.PrivateKeyFromHexString(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k)) - - invalidB32Str := uniuri.NewLen(42) - k2, err := lk.PrivateKeyFromHexString(invalidB32Str) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) + s.Require().Error(err) + s.Require().Nil(k2) }) - It("should test pubic key bytes", func() { - b := k.GetPublicKey().ToBytes() - k1, err := lk.PublicKeyFromBytes(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k.GetPublicKey())) - - invalidBytes := make([]byte, 42) - _, err = rand.Read(invalidBytes) - Ω(err).To(BeNil()) - k2, err := lk.PublicKeyFromBytes(invalidBytes) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) - }) - - It("should test pubic key b64", func() { - b := k.GetPublicKey().ToB64String() - k1, err := lk.PublicKeyFromB64String(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k.GetPublicKey())) - - invalidB64Str := uniuri.NewLen(42) - k2, err := lk.PublicKeyFromB64String(invalidB64Str) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) - }) - - It("should test pubic key b32", func() { - b := k.GetPublicKey().ToB32String() - k1, err := lk.PublicKeyFromB32String(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k.GetPublicKey())) - - invalidB32Str := uniuri.NewLen(42) - k2, err := lk.PublicKeyFromB32String(invalidB32Str) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) - }) - - It("should test pubic key hex", func() { - b := k.GetPublicKey().ToHexString() - k1, err := lk.PublicKeyFromHexString(b) - Ω(err).To(BeNil()) - Ω(k1).To(Equal(k.GetPublicKey())) + s.Run("should test private key bytes", func() { + b, err := k.ToBytes() + s.Require().NoError(err) + k1, err := lk.PrivateKeyFromBytes(b) + s.Require().NoError(err) + s.Require().Equal(k1, k) - invalidHexStr := uniuri.NewLen(42) - k2, err := lk.PublicKeyFromHexString(invalidHexStr) - Ω(err).To(HaveOccurred()) - Ω(k2).To(BeNil()) + invalidBytes := s.RandomBytes(42) + k2, err := lk.PrivateKeyFromBytes(invalidBytes) + s.Require().Error(err) + s.Require().Nil(k2) }) -}) + tc := []struct { + name string + privateKeyToString func(k *lk.PrivateKey) (string, error) + publicKeyToString func(k *lk.PublicKey) string + fromString func(string) (*lk.PrivateKey, error) + fromPubStr func(string) (*lk.PublicKey, error) + randomStr func(int) string + }{ + { + name: "b64", + privateKeyToString: func(k *lk.PrivateKey) (string, error) { + return k.ToB64String() + }, + publicKeyToString: func(k *lk.PublicKey) string { + return k.ToB64String() + }, + fromString: lk.PrivateKeyFromB64String, + fromPubStr: lk.PublicKeyFromB64String, + randomStr: s.RandomB64String, + }, + { + name: "b32", + privateKeyToString: func(k *lk.PrivateKey) (string, error) { + return k.ToB32String() + }, + publicKeyToString: func(k *lk.PublicKey) string { + return k.ToB32String() + }, + fromString: lk.PrivateKeyFromB32String, + fromPubStr: lk.PublicKeyFromB32String, + randomStr: s.RandomB32String, + }, + { + name: "hex", + privateKeyToString: func(k *lk.PrivateKey) (string, error) { + return k.ToHexString() + }, + publicKeyToString: func(k *lk.PublicKey) string { + return k.ToHexString() + }, + fromString: lk.PrivateKeyFromHexString, + fromPubStr: lk.PublicKeyFromHexString, + randomStr: s.RandomHexString, + }, + } + + for _, tc := range tc { + s.Run("should test private key "+tc.name, func() { + b, err := tc.privateKeyToString(k) + s.Require().NoError(err) + k1, err := tc.fromString(b) + s.Require().NoError(err) + s.Require().Equal(k1, k) + + invalidStr := tc.randomStr(42) + k2, err := tc.fromString(invalidStr) + s.Require().Error(err) + s.Require().Nil(k2) + }) + + s.Run("should test pubic key "+tc.name, func() { + b := tc.publicKeyToString(k.GetPublicKey()) + k1, err := tc.fromPubStr(b) + s.Require().NoError(err) + s.Require().Equal(k1, k.GetPublicKey()) + + invalidStr := s.RandomHexString(42) + k2, err := tc.fromPubStr(invalidStr) + s.Require().Error(err) + s.Require().Nil(k2) + }) + } + +} diff --git a/license_test.go b/license_test.go index fd243dd..62268c5 100644 --- a/license_test.go +++ b/license_test.go @@ -2,101 +2,104 @@ package lk_test import ( "bytes" - "crypto/rand" "github.com/hyperboloide/lk" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" ) -var _ = Describe("License", func() { +func (s *Suite) TestExamples() { + s.Run("Example complete", Example_complete) + s.Run("Example license generation", Example_licenseGeneration) + s.Run("Example license verification", Example_licenseVerification) +} - var privateKey *lk.PrivateKey - var wrongKey *lk.PrivateKey - var license *lk.License - var b []byte +func (s *Suite) TestLicense() { - BeforeEach(func() { + var privateKey *lk.PrivateKey // private key for license generation + var wrongKey *lk.PrivateKey // wrong key for verification + var license *lk.License // license to be tested + var theData []byte // data to be signed + + s.Run("Generate test data", func() { var err error privateKey, err = lk.NewPrivateKey() - Ω(err).To(BeNil()) - Ω(privateKey).ToNot(BeNil()) + s.Require().NoError(err) + s.Require().NotNil(privateKey) wrongKey, err = lk.NewPrivateKey() - Ω(err).To(BeNil()) - Ω(privateKey).ToNot(BeNil()) + s.Require().NoError(err) + s.Require().NotNil(wrongKey) + + theData = s.RandomBytes(100) - b = make([]byte, 100) - _, err = rand.Read(b) - Ω(err).To(BeNil()) + license, err = lk.NewLicense(privateKey, theData) + s.Require().NoError(err) + s.Require().NotNil(license) - license, err = lk.NewLicense(privateKey, b) - Ω(err).To(BeNil()) - Ω(license).ToNot(BeNil()) ok, err := license.Verify(privateKey.GetPublicKey()) - Ω(err).To(BeNil()) - Ω(ok).To(BeTrue()) + s.Require().NoError(err) + s.Require().True(ok) }) - It("should pass the example", func() { - Example_complete() - Example_licenseGeneration() - Example_licenseVerification() + s.Run("Should not validate with wrong key", func() { + ok, err := license.Verify(wrongKey.GetPublicKey()) + s.Require().NoError(err) + s.Require().False(ok) }) - It("should test a license with bytes", func() { + s.Run("Test license with bytes", func() { b2, err := license.ToBytes() - Ω(err).To(BeNil()) + s.Require().NoError(err) + l2, err := lk.LicenseFromBytes(b2) - Ω(err).To(BeNil()) - ok, err := l2.Verify(privateKey.GetPublicKey()) - Ω(err).To(BeNil()) - Ω(ok).To(BeTrue()) - Ω(bytes.Equal(license.Data, l2.Data)).To(BeTrue()) + s.Require().NoError(err) - }) + ok, err := l2.Verify(privateKey.GetPublicKey()) + s.Require().NoError(err) + s.Require().True(ok) - It("should not validate with wrong key", func() { - ok, err := license.Verify(wrongKey.GetPublicKey()) - Ω(err).To(BeNil()) - Ω(ok).To(BeFalse()) + s.Require().True(bytes.Equal(license.Data, l2.Data)) }) - It("should test a license with b64", func() { + s.Run("Test license with b64", func() { b2, err := license.ToB64String() - Ω(err).To(BeNil()) + s.Require().NoError(err) + l2, err := lk.LicenseFromB64String(b2) - Ω(err).To(BeNil()) + s.Require().NoError(err) + ok, err := l2.Verify(privateKey.GetPublicKey()) - Ω(err).To(BeNil()) - Ω(ok).To(BeTrue()) - Ω(bytes.Equal(license.Data, l2.Data)).To(BeTrue()) + s.Require().NoError(err) + s.Require().True(ok) + s.Require().True(bytes.Equal(license.Data, l2.Data)) }) - It("should test a license with b32", func() { + s.Run("should test a license with b32", func() { b2, err := license.ToB32String() - Ω(err).To(BeNil()) + s.Require().NoError(err) + l2, err := lk.LicenseFromB32String(b2) - Ω(err).To(BeNil()) + s.Require().NoError(err) + ok, err := l2.Verify(privateKey.GetPublicKey()) - Ω(err).To(BeNil()) - Ω(ok).To(BeTrue()) - Ω(bytes.Equal(license.Data, l2.Data)).To(BeTrue()) + s.Require().NoError(err) + s.Require().True(ok) + s.Require().True(bytes.Equal(license.Data, l2.Data)) }) - It("should test a license with hex", func() { + s.Run("should test a license with hex", func() { b2, err := license.ToHexString() - Ω(err).To(BeNil()) + s.Require().NoError(err) + l2, err := lk.LicenseFromHexString(b2) - Ω(err).To(BeNil()) + s.Require().NoError(err) + ok, err := l2.Verify(privateKey.GetPublicKey()) - Ω(err).To(BeNil()) - Ω(ok).To(BeTrue()) - Ω(bytes.Equal(license.Data, l2.Data)).To(BeTrue()) + s.Require().NoError(err) + s.Require().True(ok) + s.Require().True(bytes.Equal(license.Data, l2.Data)) }) - -}) +} diff --git a/lk_suite_test.go b/lk_suite_test.go deleted file mode 100644 index 0fa2dc7..0000000 --- a/lk_suite_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package lk_test - -import ( - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - - "testing" -) - -func TestLk(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "Lk Suite") -} diff --git a/suite_test.go b/suite_test.go new file mode 100644 index 0000000..22b8a7b --- /dev/null +++ b/suite_test.go @@ -0,0 +1,43 @@ +package lk_test + +import ( + "crypto/rand" + "encoding/base32" + "encoding/base64" + "encoding/hex" + "testing" + + "github.com/stretchr/testify/suite" +) + +type ( + Suite struct { + suite.Suite + } +) + +func TestSuite(t *testing.T) { + suite.Run(t, &Suite{}) +} + +func (s *Suite) RandomBytes(n int) []byte { + b := make([]byte, n) + _, err := rand.Read(b) + s.Require().NoError(err) + return b +} + +func (s *Suite) RandomB64String(n int) string { + b := s.RandomBytes(n) + return base64.RawStdEncoding.EncodeToString(b) +} + +func (s *Suite) RandomB32String(n int) string { + b := s.RandomBytes(n) + return base32.StdEncoding.EncodeToString(b) +} + +func (s *Suite) RandomHexString(n int) string { + b := s.RandomBytes(n) + return hex.EncodeToString(b) +}