Fixed merge
This commit is contained in:
commit
7ce8c4c649
2 changed files with 5 additions and 5 deletions
|
@ -11,7 +11,7 @@ import (
|
||||||
|
|
||||||
const errorAuthKeyNotFound = Error("AuthKey not found")
|
const errorAuthKeyNotFound = Error("AuthKey not found")
|
||||||
const errorAuthKeyExpired = Error("AuthKey expired")
|
const errorAuthKeyExpired = Error("AuthKey expired")
|
||||||
const errorAuthKeyNotReusableAlreadyUsed = Error("AuthKey not reusable already used")
|
const errSingleUseAuthKeyHasBeenUsed = Error("AuthKey has already been used")
|
||||||
|
|
||||||
// PreAuthKey describes a pre-authorization key usable in a particular namespace
|
// PreAuthKey describes a pre-authorization key usable in a particular namespace
|
||||||
type PreAuthKey struct {
|
type PreAuthKey struct {
|
||||||
|
@ -112,7 +112,7 @@ func (h *Headscale) checkKeyValidity(k string) (*PreAuthKey, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(machines) != 0 || pak.Used {
|
if len(machines) != 0 || pak.Used {
|
||||||
return nil, errorAuthKeyNotReusableAlreadyUsed
|
return nil, errSingleUseAuthKeyHasBeenUsed
|
||||||
}
|
}
|
||||||
|
|
||||||
return &pak, nil
|
return &pak, nil
|
||||||
|
|
|
@ -87,7 +87,7 @@ func (*Suite) TestAlreadyUsedKey(c *check.C) {
|
||||||
h.db.Save(&m)
|
h.db.Save(&m)
|
||||||
|
|
||||||
p, err := h.checkKeyValidity(pak.Key)
|
p, err := h.checkKeyValidity(pak.Key)
|
||||||
c.Assert(err, check.Equals, errorAuthKeyNotReusableAlreadyUsed)
|
c.Assert(err, check.Equals, errSingleUseAuthKeyHasBeenUsed)
|
||||||
c.Assert(p, check.IsNil)
|
c.Assert(p, check.IsNil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -191,5 +191,5 @@ func (*Suite) TestNotReusableMarkedAsUsed(c *check.C) {
|
||||||
h.db.Save(&pak)
|
h.db.Save(&pak)
|
||||||
|
|
||||||
_, err = h.checkKeyValidity(pak.Key)
|
_, err = h.checkKeyValidity(pak.Key)
|
||||||
c.Assert(err, check.Equals, errorAuthKeyNotReusableAlreadyUsed)
|
c.Assert(err, check.Equals, errSingleUseAuthKeyHasBeenUsed)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue