Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mpcs
dfss
Commits
4fac4ae0
Commit
4fac4ae0
authored
Apr 18, 2016
by
Loïck Bonniot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[tests] Use testify instead of bmizerany
parent
1b2f1b5d
Pipeline
#687
passed with stage
Changes
32
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
137 additions
and
136 deletions
+137
-136
build/deps.sh
build/deps.sh
+2
-1
dfssc/common/common_test.go
dfssc/common/common_test.go
+9
-9
dfssc/common/errors_test.go
dfssc/common/errors_test.go
+1
-1
dfssc/common/file_test.go
dfssc/common/file_test.go
+1
-1
dfssc/common/sequence_analysis_test.go
dfssc/common/sequence_analysis_test.go
+1
-1
dfssc/security/security_test.go
dfssc/security/security_test.go
+20
-20
dfssc/sign/create_test.go
dfssc/sign/create_test.go
+1
-1
dfssc/sign/fetch_test.go
dfssc/sign/fetch_test.go
+1
-1
dfssc/sign/starter_test.go
dfssc/sign/starter_test.go
+1
-1
dfssc/user/authentication_test.go
dfssc/user/authentication_test.go
+4
-4
dfssc/user/config_test.go
dfssc/user/config_test.go
+35
-35
dfssc/user/register_test.go
dfssc/user/register_test.go
+10
-10
dfssp/contract/contract_test.go
dfssp/contract/contract_test.go
+7
-7
dfssp/contract/create_test.go
dfssp/contract/create_test.go
+3
-3
dfssp/contract/fetch_test.go
dfssp/contract/fetch_test.go
+2
-2
dfssp/contract/file_test.go
dfssp/contract/file_test.go
+1
-1
dfssp/contract/join_test.go
dfssp/contract/join_test.go
+1
-1
dfssp/contract/ready_test.go
dfssp/contract/ready_test.go
+1
-1
dfssp/contract/sequence_test.go
dfssp/contract/sequence_test.go
+1
-1
dfssp/templates/manager_test.go
dfssp/templates/manager_test.go
+1
-1
dfssp/user/create_test.go
dfssp/user/create_test.go
+1
-1
dfssp/user/user_test.go
dfssp/user/user_test.go
+1
-1
dfsst/entities/archivesManager_test.go
dfsst/entities/archivesManager_test.go
+1
-1
dfsst/entities/check_promise_test.go
dfsst/entities/check_promise_test.go
+1
-1
dfsst/entities/check_request_test.go
dfsst/entities/check_request_test.go
+1
-1
dfsst/entities/signatureArchives_test.go
dfsst/entities/signatureArchives_test.go
+1
-1
dfsst/resolve/resolve_test.go
dfsst/resolve/resolve_test.go
+1
-1
tests/impexp_test.go
tests/impexp_test.go
+14
-14
tests/new_test.go
tests/new_test.go
+7
-7
tests/register_test.go
tests/register_test.go
+1
-1
tests/sign_test.go
tests/sign_test.go
+4
-4
tests/starters_test.go
tests/starters_test.go
+1
-1
No files found.
build/deps.sh
View file @
4fac4ae0
...
@@ -5,5 +5,6 @@ go get -u github.com/golang/protobuf/proto
...
@@ -5,5 +5,6 @@ go get -u github.com/golang/protobuf/proto
go get
-u
github.com/golang/protobuf/protoc-gen-go
go get
-u
github.com/golang/protobuf/protoc-gen-go
go get
-u
google.golang.org/grpc
go get
-u
google.golang.org/grpc
go get
-u
github.com/pborman/uuid
go get
-u
github.com/pborman/uuid
go get
-u
github.com/
bmizeran
y/assert
go get
-u
github.com/
stretchr/testif
y/assert
go get
-u
golang.org/x/crypto/ssh/terminal
go get
-u
golang.org/x/crypto/ssh/terminal
dfssc/common/common_test.go
View file @
4fac4ae0
...
@@ -6,7 +6,7 @@ import (
...
@@ -6,7 +6,7 @@ import (
"path/filepath"
"path/filepath"
"testing"
"testing"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
var
path
=
os
.
TempDir
()
var
path
=
os
.
TempDir
()
...
@@ -38,27 +38,27 @@ func TestSaveToDisk(t *testing.T) {
...
@@ -38,27 +38,27 @@ func TestSaveToDisk(t *testing.T) {
data
[
1
]
=
'o'
data
[
1
]
=
'o'
data
[
2
]
=
'o'
data
[
2
]
=
'o'
err
:=
SaveToDisk
(
data
,
ffoo
)
err
:=
SaveToDisk
(
data
,
ffoo
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised"
)
assert
.
T
(
t
,
FileExists
(
ffoo
),
"foo.txt should be present"
)
assert
.
T
rue
(
t
,
FileExists
(
ffoo
),
"foo.txt should be present"
)
}
}
// Save a string on the disk
// Save a string on the disk
func
TestSaveStringToDisk
(
t
*
testing
.
T
)
{
func
TestSaveStringToDisk
(
t
*
testing
.
T
)
{
s
:=
"bar"
s
:=
"bar"
err
:=
SaveStringToDisk
(
s
,
fbar
)
err
:=
SaveStringToDisk
(
s
,
fbar
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised"
)
assert
.
T
(
t
,
FileExists
(
fbar
),
"bar.txt should be present"
)
assert
.
T
rue
(
t
,
FileExists
(
fbar
),
"bar.txt should be present"
)
}
}
// DeleteQuietly should never raise an error, even with non-existant file
// DeleteQuietly should never raise an error, even with non-existant file
func
TestDeleteQuietly
(
t
*
testing
.
T
)
{
func
TestDeleteQuietly
(
t
*
testing
.
T
)
{
s
:=
"baz"
s
:=
"baz"
_
=
SaveStringToDisk
(
s
,
fbaz
)
_
=
SaveStringToDisk
(
s
,
fbaz
)
assert
.
T
(
t
,
FileExists
(
fbaz
),
"baz.txt should be present"
)
assert
.
T
rue
(
t
,
FileExists
(
fbaz
),
"baz.txt should be present"
)
DeleteQuietly
(
fbaz
)
DeleteQuietly
(
fbaz
)
assert
.
T
(
t
,
!
FileExists
(
fbaz
),
"baz.txt should not be present"
)
assert
.
T
rue
(
t
,
!
FileExists
(
fbaz
),
"baz.txt should not be present"
)
// Assert it does not panic when deleting an inexistant file
// Assert it does not panic when deleting an inexistant file
DeleteQuietly
(
"dummy"
)
DeleteQuietly
(
"dummy"
)
...
@@ -68,12 +68,12 @@ func TestDeleteQuietly(t *testing.T) {
...
@@ -68,12 +68,12 @@ func TestDeleteQuietly(t *testing.T) {
func
TestReadFile
(
t
*
testing
.
T
)
{
func
TestReadFile
(
t
*
testing
.
T
)
{
s
:=
"qux"
s
:=
"qux"
_
=
SaveStringToDisk
(
s
,
fqux
)
_
=
SaveStringToDisk
(
s
,
fqux
)
assert
.
T
(
t
,
FileExists
(
fqux
),
"qux.txt should be present"
)
assert
.
T
rue
(
t
,
FileExists
(
fqux
),
"qux.txt should be present"
)
data
,
err
:=
ReadFile
(
fqux
)
data
,
err
:=
ReadFile
(
fqux
)
if
err
!=
nil
{
if
err
!=
nil
{
fmt
.
Println
(
err
.
Error
())
fmt
.
Println
(
err
.
Error
())
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised while reading the file"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised while reading the file"
)
}
}
assert
.
Equal
(
t
,
s
,
fmt
.
Sprintf
(
"%s"
,
data
),
"Expected qux, received "
,
fmt
.
Sprintf
(
"%s"
,
data
))
assert
.
Equal
(
t
,
s
,
fmt
.
Sprintf
(
"%s"
,
data
),
"Expected qux, received "
,
fmt
.
Sprintf
(
"%s"
,
data
))
...
...
dfssc/common/errors_test.go
View file @
4fac4ae0
...
@@ -4,7 +4,7 @@ import (
...
@@ -4,7 +4,7 @@ import (
"testing"
"testing"
"dfss/dfssp/api"
"dfss/dfssp/api"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
func
TestEvaluateErrorCodeResponse
(
t
*
testing
.
T
)
{
func
TestEvaluateErrorCodeResponse
(
t
*
testing
.
T
)
{
...
...
dfssc/common/file_test.go
View file @
4fac4ae0
...
@@ -4,7 +4,7 @@ import (
...
@@ -4,7 +4,7 @@ import (
"io/ioutil"
"io/ioutil"
"testing"
"testing"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
func
TestUnmarshalDFSSFile
(
t
*
testing
.
T
)
{
func
TestUnmarshalDFSSFile
(
t
*
testing
.
T
)
{
...
...
dfssc/common/sequence_analysis_test.go
View file @
4fac4ae0
...
@@ -4,7 +4,7 @@ import (
...
@@ -4,7 +4,7 @@ import (
"fmt"
"fmt"
"testing"
"testing"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
func
TestFindNextIndex
(
t
*
testing
.
T
)
{
func
TestFindNextIndex
(
t
*
testing
.
T
)
{
...
...
dfssc/security/security_test.go
View file @
4fac4ae0
...
@@ -7,7 +7,7 @@ import (
...
@@ -7,7 +7,7 @@ import (
"path/filepath"
"path/filepath"
"testing"
"testing"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
var
crtFixture
=
`-----BEGIN CERTIFICATE-----
var
crtFixture
=
`-----BEGIN CERTIFICATE-----
...
@@ -34,9 +34,9 @@ func TestGenerateKeys(t *testing.T) {
...
@@ -34,9 +34,9 @@ func TestGenerateKeys(t *testing.T) {
fkey
:=
filepath
.
Join
(
path
,
"genKey.pem"
)
fkey
:=
filepath
.
Join
(
path
,
"genKey.pem"
)
rsa
,
err
:=
GenerateKeys
(
512
,
"pwd"
,
fkey
)
rsa
,
err
:=
GenerateKeys
(
512
,
"pwd"
,
fkey
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised during generation"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised during generation"
)
assert
.
T
(
t
,
rsa
!=
nil
,
"RSA key should not be nil"
)
assert
.
T
rue
(
t
,
rsa
!=
nil
,
"RSA key should not be nil"
)
assert
.
T
(
t
,
common
.
FileExists
(
fkey
),
"File is missing"
)
assert
.
T
rue
(
t
,
common
.
FileExists
(
fkey
),
"File is missing"
)
common
.
DeleteQuietly
(
fkey
)
common
.
DeleteQuietly
(
fkey
)
}
}
...
@@ -46,13 +46,13 @@ func TestCertificateRequest(t *testing.T) {
...
@@ -46,13 +46,13 @@ func TestCertificateRequest(t *testing.T) {
rsa
,
err
:=
GenerateKeys
(
512
,
"pwd"
,
fkey
)
rsa
,
err
:=
GenerateKeys
(
512
,
"pwd"
,
fkey
)
defer
common
.
DeleteQuietly
(
fkey
)
defer
common
.
DeleteQuietly
(
fkey
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised during generation"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised during generation"
)
assert
.
T
(
t
,
rsa
!=
nil
,
"RSA key should not be nil"
)
assert
.
T
rue
(
t
,
rsa
!=
nil
,
"RSA key should not be nil"
)
assert
.
T
(
t
,
common
.
FileExists
(
fkey
),
"File is missing"
)
assert
.
T
rue
(
t
,
common
.
FileExists
(
fkey
),
"File is missing"
)
csr
,
err
:=
GenerateCertificateRequest
(
"France"
,
"DFSS"
,
"DFSS_C"
,
"dfssc@dfss.org"
,
rsa
)
csr
,
err
:=
GenerateCertificateRequest
(
"France"
,
"DFSS"
,
"DFSS_C"
,
"dfssc@dfss.org"
,
rsa
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised during generation of certificate request"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised during generation of certificate request"
)
assert
.
T
(
t
,
csr
!=
""
,
"Certificate request should not be nil"
)
assert
.
T
rue
(
t
,
csr
!=
""
,
"Certificate request should not be nil"
)
}
}
// Test saving rsa key on the disk
// Test saving rsa key on the disk
...
@@ -62,18 +62,18 @@ func TestDumpingKey(t *testing.T) {
...
@@ -62,18 +62,18 @@ func TestDumpingKey(t *testing.T) {
rsa
,
err
:=
GenerateKeys
(
512
,
"pwd"
,
fkey
)
rsa
,
err
:=
GenerateKeys
(
512
,
"pwd"
,
fkey
)
defer
common
.
DeleteQuietly
(
fkey
)
defer
common
.
DeleteQuietly
(
fkey
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised during generation"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised during generation"
)
assert
.
T
(
t
,
rsa
!=
nil
,
"RSA key should not be nil"
)
assert
.
T
rue
(
t
,
rsa
!=
nil
,
"RSA key should not be nil"
)
assert
.
T
(
t
,
common
.
FileExists
(
fkey
),
"File is missing"
)
assert
.
T
rue
(
t
,
common
.
FileExists
(
fkey
),
"File is missing"
)
k
,
err
:=
GetPrivateKey
(
fkey
,
""
)
k
,
err
:=
GetPrivateKey
(
fkey
,
""
)
assert
.
T
(
t
,
err
!=
nil
,
"An error should have been raised"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"An error should have been raised"
)
k
,
err
=
GetPrivateKey
(
fkey
,
"dummypwd"
)
k
,
err
=
GetPrivateKey
(
fkey
,
"dummypwd"
)
assert
.
T
(
t
,
err
!=
nil
,
"An error should have been raised"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"An error should have been raised"
)
k
,
err
=
GetPrivateKey
(
fkey
,
"pwd"
)
k
,
err
=
GetPrivateKey
(
fkey
,
"pwd"
)
assert
.
T
(
t
,
err
==
nil
,
"No error should have been raised"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"No error should have been raised"
)
assert
.
Equal
(
t
,
*
rsa
,
*
k
,
"Keys should be equal"
)
assert
.
Equal
(
t
,
*
rsa
,
*
k
,
"Keys should be equal"
)
}
}
...
@@ -85,14 +85,14 @@ func TestDumpCrt(t *testing.T) {
...
@@ -85,14 +85,14 @@ func TestDumpCrt(t *testing.T) {
err
:=
SaveCertificate
(
crtFixture
,
fcert
)
err
:=
SaveCertificate
(
crtFixture
,
fcert
)
defer
common
.
DeleteQuietly
(
fcert
)
defer
common
.
DeleteQuietly
(
fcert
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised during saving"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised during saving"
)
assert
.
T
(
t
,
common
.
FileExists
(
fcert
),
"File is missing"
)
assert
.
T
rue
(
t
,
common
.
FileExists
(
fcert
),
"File is missing"
)
data
,
err
:=
common
.
ReadFile
(
fcert
)
data
,
err
:=
common
.
ReadFile
(
fcert
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised while reading file"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised while reading file"
)
assert
.
Equal
(
t
,
crtFixture
,
fmt
.
Sprintf
(
"%s"
,
data
),
"Certificates are not equal"
)
assert
.
Equal
(
t
,
crtFixture
,
fmt
.
Sprintf
(
"%s"
,
data
),
"Certificates are not equal"
)
crt
,
err
:=
GetCertificate
(
fcert
)
crt
,
err
:=
GetCertificate
(
fcert
)
assert
.
T
(
t
,
err
==
nil
,
"An error has been raised while parsing certificate"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"An error has been raised while parsing certificate"
)
assert
.
T
(
t
,
crt
!=
nil
,
"Certificate is nil"
)
assert
.
T
rue
(
t
,
crt
!=
nil
,
"Certificate is nil"
)
}
}
dfssc/sign/create_test.go
View file @
4fac4ae0
...
@@ -10,7 +10,7 @@ import (
...
@@ -10,7 +10,7 @@ import (
"dfss/auth"
"dfss/auth"
"dfss/mockp/server"
"dfss/mockp/server"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
var
path
=
filepath
.
Join
(
".."
,
"testdata"
)
var
path
=
filepath
.
Join
(
".."
,
"testdata"
)
...
...
dfssc/sign/fetch_test.go
View file @
4fac4ae0
...
@@ -6,7 +6,7 @@ import (
...
@@ -6,7 +6,7 @@ import (
"os"
"os"
"testing"
"testing"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
func
TestFetchContract
(
t
*
testing
.
T
)
{
func
TestFetchContract
(
t
*
testing
.
T
)
{
...
...
dfssc/sign/starter_test.go
View file @
4fac4ae0
...
@@ -5,7 +5,7 @@ import (
...
@@ -5,7 +5,7 @@ import (
"dfss/dfssp/contract"
"dfss/dfssp/contract"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
func
TestFindId
(
t
*
testing
.
T
)
{
func
TestFindId
(
t
*
testing
.
T
)
{
...
...
dfssc/user/authentication_test.go
View file @
4fac4ae0
...
@@ -3,23 +3,23 @@ package user
...
@@ -3,23 +3,23 @@ package user
import
(
import
(
"dfss/dfssc/common"
"dfss/dfssc/common"
"fmt"
"fmt"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
"os"
"os"
"testing"
"testing"
)
)
func
TestAuthenticationValidation
(
t
*
testing
.
T
)
{
func
TestAuthenticationValidation
(
t
*
testing
.
T
)
{
_
,
err
:=
NewAuthManager
(
"fca"
,
fcert
,
addrPort
,
"dummy"
,
"token"
)
_
,
err
:=
NewAuthManager
(
"fca"
,
fcert
,
addrPort
,
"dummy"
,
"token"
)
assert
.
T
(
t
,
err
!=
nil
,
"Email is invalid"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Email is invalid"
)
f
,
_
:=
os
.
Create
(
fcert
)
f
,
_
:=
os
.
Create
(
fcert
)
_
=
f
.
Close
()
_
=
f
.
Close
()
_
,
err
=
NewAuthManager
(
"fca"
,
fcert
,
addrPort
,
"mail@mail.mail"
,
"token"
)
_
,
err
=
NewAuthManager
(
"fca"
,
fcert
,
addrPort
,
"mail@mail.mail"
,
"token"
)
assert
.
T
(
t
,
err
!=
nil
,
"Cert file already there"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Cert file already there"
)
_
=
os
.
Remove
(
fcert
)
_
=
os
.
Remove
(
fcert
)
_
,
err
=
NewAuthManager
(
"fca"
,
fcert
,
addrPort
,
"mail@mail.mail"
,
"token"
)
_
,
err
=
NewAuthManager
(
"fca"
,
fcert
,
addrPort
,
"mail@mail.mail"
,
"token"
)
assert
.
T
(
t
,
err
!=
nil
,
"CA file not there"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"CA file not there"
)
_
,
err
=
NewAuthManager
(
fca
,
fcert
,
addrPort
,
"mail@mail.mail"
,
"token"
)
_
,
err
=
NewAuthManager
(
fca
,
fcert
,
addrPort
,
"mail@mail.mail"
,
"token"
)
assert
.
Equal
(
t
,
err
,
nil
)
assert
.
Equal
(
t
,
err
,
nil
)
...
...
dfssc/user/config_test.go
View file @
4fac4ae0
...
@@ -8,7 +8,7 @@ import (
...
@@ -8,7 +8,7 @@ import (
"path/filepath"
"path/filepath"
"testing"
"testing"
"github.com/
bmizeran
y/assert"
"github.com/
stretchr/testif
y/assert"
)
)
const
certFixture
=
`-----BEGIN CERTIFICATE-----
const
certFixture
=
`-----BEGIN CERTIFICATE-----
...
@@ -46,15 +46,15 @@ func TestInvalidFiles(t *testing.T) {
...
@@ -46,15 +46,15 @@ func TestInvalidFiles(t *testing.T) {
defer
deleteFiles
(
keyFile
,
certFile
,
"invalidConf.pem"
)
defer
deleteFiles
(
keyFile
,
certFile
,
"invalidConf.pem"
)
_
,
err
:=
NewConfig
(
"inexistantKey"
,
"inexistantCert"
)
_
,
err
:=
NewConfig
(
"inexistantKey"
,
"inexistantCert"
)
assert
.
T
f
(
t
,
err
!=
nil
,
"No key file nor cert file, expected error"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"No key file nor cert file, expected error"
)
_
=
common
.
SaveStringToDisk
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
keyFixture
)),
keyFile
)
_
=
common
.
SaveStringToDisk
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
keyFixture
)),
keyFile
)
_
,
err
=
NewConfig
(
keyFile
,
"inexistantCert"
)
_
,
err
=
NewConfig
(
keyFile
,
"inexistantCert"
)
assert
.
T
f
(
t
,
err
!=
nil
,
"No cert file, expected error"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"No cert file, expected error"
)
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
_
,
err
=
NewConfig
(
keyFile
,
certFile
)
_
,
err
=
NewConfig
(
keyFile
,
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
}
}
// TestErrorDumpingConfig checks the error that may be raised while dumping the configuration to the disk
// TestErrorDumpingConfig checks the error that may be raised while dumping the configuration to the disk
...
@@ -64,25 +64,25 @@ func TestErrorDumpingConfig(t *testing.T) {
...
@@ -64,25 +64,25 @@ func TestErrorDumpingConfig(t *testing.T) {
defer
deleteFiles
(
keyFile
,
certFile
,
"invalidConf.pem"
)
defer
deleteFiles
(
keyFile
,
certFile
,
"invalidConf.pem"
)
err
:=
common
.
SaveStringToDisk
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
keyFixture
)),
keyFile
)
err
:=
common
.
SaveStringToDisk
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
keyFixture
)),
keyFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, file is present"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, file is present"
)
err
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
err
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, cert is valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, cert is valid"
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
err
=
config
.
SaveConfigToFile
(
"file"
,
"abc"
,
""
)
err
=
config
.
SaveConfigToFile
(
"file"
,
"abc"
,
""
)
assert
.
T
f
(
t
,
err
!=
nil
,
"Expected an error, passphrase is too short (< 4 char)"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Expected an error, passphrase is too short (< 4 char)"
)
err
=
config
.
SaveConfigToFile
(
keyFile
,
"passphrase"
,
""
)
err
=
config
.
SaveConfigToFile
(
keyFile
,
"passphrase"
,
""
)
assert
.
T
f
(
t
,
err
!=
nil
,
"Expected an error, file is already there"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Expected an error, file is already there"
)
common
.
DeleteQuietly
(
keyFile
)
common
.
DeleteQuietly
(
keyFile
)
_
=
common
.
SaveStringToDisk
(
"Invalid key"
,
keyFile
)
_
=
common
.
SaveStringToDisk
(
"Invalid key"
,
keyFile
)
config
,
_
=
NewConfig
(
keyFile
,
certFile
)
config
,
_
=
NewConfig
(
keyFile
,
certFile
)
err
=
config
.
SaveConfigToFile
(
"file"
,
"passphrase"
,
"passphrase"
)
err
=
config
.
SaveConfigToFile
(
"file"
,
"passphrase"
,
"passphrase"
)
assert
.
T
f
(
t
,
err
!=
nil
,
"Expected an error, private key is invalid"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Expected an error, private key is invalid"
)
common
.
DeleteQuietly
(
certFile
)
common
.
DeleteQuietly
(
certFile
)
common
.
DeleteQuietly
(
keyFile
)
common
.
DeleteQuietly
(
keyFile
)
...
@@ -90,7 +90,7 @@ func TestErrorDumpingConfig(t *testing.T) {
...
@@ -90,7 +90,7 @@ func TestErrorDumpingConfig(t *testing.T) {
_
=
common
.
SaveStringToDisk
(
"Invalid certificate"
,
certFile
)
_
=
common
.
SaveStringToDisk
(
"Invalid certificate"
,
certFile
)
config
,
_
=
NewConfig
(
keyFile
,
certFile
)
config
,
_
=
NewConfig
(
keyFile
,
certFile
)
err
=
config
.
SaveConfigToFile
(
"file"
,
"passphrase"
,
"passphrase"
)
err
=
config
.
SaveConfigToFile
(
"file"
,
"passphrase"
,
"passphrase"
)
assert
.
T
f
(
t
,
err
!=
nil
,
"Expected an error, certificate is invalid"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Expected an error, certificate is invalid"
)
}
}
...
@@ -103,21 +103,21 @@ func TestDumpingFile(t *testing.T) {
...
@@ -103,21 +103,21 @@ func TestDumpingFile(t *testing.T) {
defer
deleteFiles
(
keyFile
,
certFile
,
configPath
)
defer
deleteFiles
(
keyFile
,
certFile
,
configPath
)
err
:=
common
.
SaveStringToDisk
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
keyFixture
)),
keyFile
)
err
:=
common
.
SaveStringToDisk
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
keyFixture
)),
keyFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, file is present"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, file is present"
)
err
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
err
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, cert is valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, cert is valid"
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
err
=
config
.
SaveConfigToFile
(
configPath
,
"passphrase"
,
""
)
err
=
config
.
SaveConfigToFile
(
configPath
,
"passphrase"
,
""
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, config is valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, config is valid"
)
assert
.
T
f
(
t
,
common
.
FileExists
(
configPath
),
"Expected a config file present"
)
assert
.
T
rue
(
t
,
common
.
FileExists
(
configPath
),
"Expected a config file present"
)
_
,
err
=
common
.
ReadFile
(
configPath
)
_
,
err
=
common
.
ReadFile
(
configPath
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, config is present"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, config is present"
)
}
}
// TestErrorDecodeFile tries to decode a configuration file and checks the errors raised
// TestErrorDecodeFile tries to decode a configuration file and checks the errors raised
...
@@ -132,19 +132,19 @@ func TestErrorDecodeFile(t *testing.T) {
...
@@ -132,19 +132,19 @@ func TestErrorDecodeFile(t *testing.T) {
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
_
,
err
:=
DecodeConfiguration
(
"inexistantFile"
,
"passphrase"
,
""
)
_
,
err
:=
DecodeConfiguration
(
"inexistantFile"
,
"passphrase"
,
""
)
assert
.
T
f
(
t
,
err
!=
nil
,
"File is invalid, impossible to decode configuration"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"File is invalid, impossible to decode configuration"
)
_
,
err
=
DecodeConfiguration
(
keyFile
,
"pas"
,
""
)
_
,
err
=
DecodeConfiguration
(
keyFile
,
"pas"
,
""
)
assert
.
T
f
(
t
,
err
!=
nil
,
"Passphrase is invalid, should be at least 4 char long"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Passphrase is invalid, should be at least 4 char long"
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
err
=
config
.
SaveConfigToFile
(
configPath
,
"passphrase"
,
""
)
err
=
config
.
SaveConfigToFile
(
configPath
,
"passphrase"
,
""
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, config is valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, config is valid"
)
config
,
err
=
DecodeConfiguration
(
configPath
,
"pass"
,
""
)
config
,
err
=
DecodeConfiguration
(
configPath
,
"pass"
,
""
)
assert
.
T
f
(
t
,
err
!=
nil
,
"Expected error, wrong passphrase"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Expected error, wrong passphrase"
)
}
}
...
@@ -160,18 +160,18 @@ func TestDecodeConfig(t *testing.T) {
...
@@ -160,18 +160,18 @@ func TestDecodeConfig(t *testing.T) {
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
err
=
config
.
SaveConfigToFile
(
configPath
,
"passphrase"
,
""
)
err
=
config
.
SaveConfigToFile
(
configPath
,
"passphrase"
,
""
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, config is valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, config is valid"
)
decoded
,
err
:=
DecodeConfiguration
(
configPath
,
""
,
"passphrase"
)
decoded
,
err
:=
DecodeConfiguration
(
configPath
,
""
,
"passphrase"
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, config should have been decodedi"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, config should have been decodedi"
)
assert
.
Equal
f
(
t
,
config
.
KeyFile
,
decoded
.
KeyFile
,
"Wrong keyFile parameter"
)
assert
.
Equal
(
t
,
config
.
KeyFile
,
decoded
.
KeyFile
,
"Wrong keyFile parameter"
)
assert
.
Equal
f
(
t
,
config
.
KeyData
,
decoded
.
KeyData
,
"Wrong keyData parameter"
)
assert
.
Equal
(
t
,
config
.
KeyData
,
decoded
.
KeyData
,
"Wrong keyData parameter"
)
assert
.
Equal
f
(
t
,
config
.
CertFile
,
decoded
.
CertFile
,
"Wrong certFile parameter"
)
assert
.
Equal
(
t
,
config
.
CertFile
,
decoded
.
CertFile
,
"Wrong certFile parameter"
)
assert
.
Equal
f
(
t
,
config
.
CertData
,
decoded
.
CertData
,
"Wrong certData parameter"
)
assert
.
Equal
(
t
,
config
.
CertData
,
decoded
.
CertData
,
"Wrong certData parameter"
)
}
}
// TestSaveFilesToDisk tries to create the certificate and private key on the disk from
// TestSaveFilesToDisk tries to create the certificate and private key on the disk from
...
@@ -187,22 +187,22 @@ func TestSaveFilesToDisk(t *testing.T) {
...
@@ -187,22 +187,22 @@ func TestSaveFilesToDisk(t *testing.T) {
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
_
=
security
.
SaveCertificate
(
fmt
.
Sprintf
(
"%s"
,
[]
byte
(
certFixture
)),
certFile
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
config
,
err
:=
NewConfig
(
keyFile
,
certFile
)
assert
.
T
f
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"Expected no error, files are present and valid"
)
err
=
config
.
SaveUserInformations
()
err
=
config
.
SaveUserInformations
()
assert
.
T
f
(
t
,
err
!=
nil
,
"Expected an error, files are already present"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Expected an error, files are already present"
)
common
.
DeleteQuietly
(
keyFile
)
common
.
DeleteQuietly
(
keyFile
)
err
=
config
.
SaveUserInformations
()
err
=
config
.
SaveUserInformations
()
assert
.
T
f
(
t
,
err
!=
nil
,
"Expected an error, certificate file is already present"
)
assert
.
T
rue
(
t
,
err
!=
nil
,
"Expected an error, certificate file is already present"
)
common
.
DeleteQuietly
(
certFile
)
common
.
DeleteQuietly
(
certFile
)
err
=
config
.
SaveUserInformations
()
err
=
config
.
SaveUserInformations
()
assert
.
T
f
(
t
,
err
==
nil
,
"No error expected, files are not here"
)
assert
.
T
rue
(
t
,
err
==
nil
,
"No error expected, files are not here"
)
assert
.
T
f
(
t
,
common
.
FileExists
(
keyFile
),
"Expected private key file"
)
assert
.
T
rue
(
t
,
common
.
FileExists
(
keyFile
),
"Expected private key file"
)
assert
.
T
f
(
t
,
common
.
FileExists
(
certFile
),
"Expected certificate file"
)
assert
.
T
rue
(
t
,
common
.
FileExists
(
certFile
),
"Expected certificate file"
)
}
}