Skip to content

Commit

Permalink
removal of Fatals
Browse files Browse the repository at this point in the history
  • Loading branch information
@cviecco
cviecco committed Apr 12, 2024
1 parent 0344eb7 commit 3d284a9
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 31 deletions.
5 changes: 4 additions & 1 deletion cmd/keymaster/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,10 @@ func main() {
logger.Fatal(err)
}
if *checkDevices {
u2f.CheckU2FDevices(logger)
err = u2f.CheckU2FDevices(logger)
if err != nil {
logger.Fatal(err)
}
return
}
computeUserAgent()
Expand Down
4 changes: 2 additions & 2 deletions lib/client/twofa/u2f/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

// CheckU2FDevices checks the U2F devices and terminates the application by
// calling Fatal on the passed logger if the U2F devices cannot be read.
func CheckU2FDevices(logger log.DebugLogger) {
checkU2FDevices(logger)
func CheckU2FDevices(logger log.DebugLogger) error {
return checkU2FDevices(logger)
}

// DoU2FAuthenticate does U2F authentication
Expand Down
57 changes: 29 additions & 28 deletions lib/client/twofa/u2f/u2f.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ type WebAuthnAuthenticationResponse struct {
var u2fHostTestUserPresenceError u2fhost.TestOfUserPresenceRequiredError
var u2fHostBadKeyHandleError u2fhost.BadKeyHandleError

func checkU2FDevices(logger log.DebugLogger) {
func checkU2FDevices(logger log.DebugLogger) error {
// TODO: move this to initialization code, ans pass the device list to this function?
// or maybe pass the token?...
devices, err := u2fhid.Devices()
if err != nil {
logger.Fatal(err)
return err
}
if len(devices) == 0 {
logger.Fatal("no U2F tokens found")
return fmt.Errorf("no U2F tokens found")
}

// TODO: transform this into an iteration over all found devices
Expand All @@ -77,7 +77,7 @@ func checkU2FDevices(logger log.DebugLogger) {

dev, err := u2fhid.Open(d)
if err != nil {
logger.Fatal(err)
return err
}
defer dev.Close()
}
Expand All @@ -94,11 +94,10 @@ func checkU2FDevices(logger log.DebugLogger) {
logger.Printf("%+v", d2)
}
if len(devices2) == 0 {
logger.Fatal("no U2F (u2fHost) tokens found")
} else {
logger.Printf("u2fHost %d devices found", len(devices2))
return fmt.Errorf("no U2F (u2fHost) tokens found")
}

logger.Printf("u2fHost %d devices found", len(devices2))
return nil
}

func doU2FAuthenticate(
Expand All @@ -110,7 +109,7 @@ func doU2FAuthenticate(
url := baseURL + "/u2f/SignRequest"
signRequest, err := http.NewRequest("GET", url, nil)
if err != nil {
logger.Fatal(err)
return err
}
signRequest.Header.Set("User-Agent", userAgentString)
signRequestResp, err := client.Do(signRequest) // Client.Get(targetUrl)
Expand All @@ -130,7 +129,7 @@ func doU2FAuthenticate(
var webSignRequest u2f.WebSignRequest
err = json.NewDecoder(signRequestResp.Body).Decode(&webSignRequest)
if err != nil {
logger.Fatal(err)
return err
}
io.Copy(ioutil.Discard, signRequestResp.Body)
signRequestResp.Body.Close()
Expand All @@ -139,7 +138,7 @@ func doU2FAuthenticate(
// or maybe pass the token?...
devices, err := u2fhid.Devices()
if err != nil {
logger.Fatal(err)
logger.Println(err)
return err
}
if len(devices) == 0 {
Expand All @@ -153,13 +152,13 @@ func doU2FAuthenticate(
d.Manufacturer, d.Product, d.ProductID, d.VendorID)
dev, err := u2fhid.Open(d)
if err != nil {
logger.Fatal(err)
return err
}
defer dev.Close()
t := u2ftoken.NewToken(dev)
version, err := t.Version()
if err != nil {
logger.Fatal(err)
return err
}
// TODO: Maybe use Debugf()?
logger.Println("version:", version)
Expand All @@ -172,7 +171,7 @@ func doU2FAuthenticate(
err = json.NewEncoder(tokenAuthenticationBuf).Encode(
tokenAuthenticationClientData)
if err != nil {
logger.Fatal(err)
return err
}
reqSignChallenge := sha256.Sum256(tokenAuthenticationBuf.Bytes())
// TODO: update creation to silence linter
Expand All @@ -189,7 +188,8 @@ func doU2FAuthenticate(
decodedHandle, err := base64.RawURLEncoding.DecodeString(
registeredKey.KeyHandle)
if err != nil {
logger.Fatal(err)
logger.Println(err)
return err
}
keyHandle = decodedHandle
req = u2ftoken.AuthenticateRequest{
Expand Down Expand Up @@ -233,7 +233,7 @@ func doU2FAuthenticate(
}

}
logger.Fatal(err)
return err
}
rawBytes = res.RawResponse
logger.Printf("counter = %d, signature = %x",
Expand All @@ -252,7 +252,8 @@ func doU2FAuthenticate(
webSignRequestBuf := &bytes.Buffer{}
err = json.NewEncoder(webSignRequestBuf).Encode(signRequestResponse)
if err != nil {
logger.Fatal(err)
logger.Println(err)
return err
}
url = baseURL + "/u2f/SignResponse"
webSignRequest2, err := http.NewRequest("POST", url, webSignRequestBuf)
Expand Down Expand Up @@ -449,7 +450,7 @@ func withDevicesDoU2FAuthenticate(
url := baseURL + "/u2f/SignRequest"
signRequest, err := http.NewRequest("GET", url, nil)
if err != nil {
logger.Fatal(err)
return err
}
signRequest.Header.Set("User-Agent", userAgentString)
signRequestResp, err := client.Do(signRequest) // Client.Get(targetUrl)
Expand All @@ -469,7 +470,7 @@ func withDevicesDoU2FAuthenticate(
var webSignRequest u2f.WebSignRequest
err = json.NewDecoder(signRequestResp.Body).Decode(&webSignRequest)
if err != nil {
logger.Fatal(err)
return err
}
io.Copy(ioutil.Discard, signRequestResp.Body)
signRequestResp.Body.Close()
Expand All @@ -490,7 +491,7 @@ func withDevicesDoU2FAuthenticate(
return err
}
if deviceResponse == nil {
logger.Fatal("nil response from device?")
return fmt.Errorf("nil response from device?")
}
logger.Debugf(1, "signResponse authenticateHelper done")

Expand All @@ -499,7 +500,7 @@ func withDevicesDoU2FAuthenticate(
webSignRequestBuf := &bytes.Buffer{}
err = json.NewEncoder(webSignRequestBuf).Encode(deviceResponse)
if err != nil {
logger.Fatal(err)
return err
}
url = baseURL + "/u2f/SignResponse"
webSignRequest2, err := http.NewRequest("POST", url, webSignRequestBuf)
Expand Down Expand Up @@ -537,7 +538,7 @@ func withDevicesDoWebAuthnAuthenticate(
targetURL := baseURL + "/webauthn/AuthBegin/" // TODO: this should be grabbed from the webauthn definition as a const
signRequest, err := http.NewRequest("GET", targetURL, nil)
if err != nil {
logger.Fatal(err)
return err
}
signRequest.Header.Set("User-Agent", userAgentString)
signRequestResp, err := client.Do(signRequest) // Client.Get(targetUrl)
Expand All @@ -556,7 +557,7 @@ func withDevicesDoWebAuthnAuthenticate(
var credentialAssertion protocol.CredentialAssertion
err = json.NewDecoder(signRequestResp.Body).Decode(&credentialAssertion)
if err != nil {
logger.Fatal(err)
return err
}
io.Copy(ioutil.Discard, signRequestResp.Body)
signRequestResp.Body.Close()
Expand Down Expand Up @@ -603,7 +604,7 @@ func withDevicesDoWebAuthnAuthenticate(
return err
}
if deviceResponse == nil {
logger.Fatal("nil response from device?")
return fmt.Errorf("nil response from device?")
}
logger.Debugf(2, "signResponse authenticateHelper done")

Expand All @@ -622,11 +623,11 @@ func withDevicesDoWebAuthnAuthenticate(
var clientData ClientData
clientDataBytes, err := base64.RawURLEncoding.DecodeString(deviceResponse.ClientData)
if err != nil {
logger.Fatal("Cant base64 decode ClientData")
return fmt.Errorf("Cant base64 decode ClientData")
}
err = json.Unmarshal(clientDataBytes, &clientData)
if err != nil {
logger.Fatal("unmarshall clientData")
return fmt.Errorf("unmarshall clientData")
}
logger.Debugf(2, "clientData =%+v", clientData)
if clientData.Typ == clientDataAuthenticationTypeValue {
Expand All @@ -635,7 +636,7 @@ func withDevicesDoWebAuthnAuthenticate(
webSignRequestBuf := &bytes.Buffer{}
err = json.NewEncoder(webSignRequestBuf).Encode(deviceResponse)
if err != nil {
logger.Fatal(err)
return err
}
targetURL = baseURL + "/u2f/SignResponse"
webSignRequest2, err := http.NewRequest("POST", targetURL, webSignRequestBuf)
Expand Down Expand Up @@ -674,7 +675,7 @@ func withDevicesDoWebAuthnAuthenticate(
// Now we write the output data:
responseBytes, err := json.Marshal(webResponse)
if err != nil {
logger.Fatal(err)
return err
}
logger.Debugf(3, "responseBytes=%s", string(responseBytes))
webSignRequestBuf := bytes.NewReader(responseBytes)
Expand Down

0 comments on commit 3d284a9

Please sign in to comment.