mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

more review comments!

Browse source
This commit is contained in:
Mark Haines 2017-06-16 15:15:11 +01:00
parent 7fa2005c94
commit c4d34db748
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/github.com/matrix-org/dendrite/common/config/config.go
View file

@ -310,6 +310,7 @@ func (config *Dendrite) check() error {
func absPath(dir string, path Path) string { func absPath(dir string, path Path) string {
if filepath.IsAbs(string(path)) { if filepath.IsAbs(string(path)) {
// filepath.Join cleans the path so we should clean the absolute paths as well for consistency.
return filepath.Clean(string(path)) return filepath.Clean(string(path))
} }
return filepath.Join(dir, string(path)) return filepath.Join(dir, string(path))

6
src/github.com/matrix-org/dendrite/common/config/config_test.go
View file

@ -74,15 +74,17 @@ func TestReadKey(t *testing.T) {
if err != nil { if err != nil {
t.Error("failed to load private key:", err) t.Error("failed to load private key:", err)
} }
wantKeyID := "ed25519:c8NsuQ" wantKeyID := testKeyID
if wantKeyID != string(keyID) { if wantKeyID != string(keyID) {
t.Errorf("wanted key ID to be %q, got %q", wantKeyID, keyID) t.Errorf("wanted key ID to be %q, got %q", wantKeyID, keyID)
} }
} }
const testKeyID = "ed25519:c8NsuQ"
const testKey = ` const testKey = `
-----BEGIN MATRIX PRIVATE KEY----- -----BEGIN MATRIX PRIVATE KEY-----
Key-ID: ed25519:c8NsuQ Key-ID: ` + testKeyID + `
7KRZiZ2sTyRR8uqqUjRwczuwRXXkUMYIUHq4Mc3t4bE= 7KRZiZ2sTyRR8uqqUjRwczuwRXXkUMYIUHq4Mc3t4bE=
-----END MATRIX PRIVATE KEY----- -----END MATRIX PRIVATE KEY-----
` `