Merge pull request #65 from rgooch/self-service-bootstrap

Add UserHasRegistered2ndFactor field to user profile.

cmd/keymasterd/2fa_totp.go

@@ -220,6 +220,7 @@ func (state *RuntimeState) validateNewTOTP(w http.ResponseWriter, r *http.Reques
 	newIndex := newTOTPAuthData.CreatedAt.Unix()
 	profile.TOTPAuthData[newIndex] = &newTOTPAuthData
 	profile.PendingTOTPSecret = nil
+	profile.UserHasRegistered2ndFactor = true
 	err = state.SaveUserProfile(authUser, profile)
 	if err != nil {
 		logger.Printf("Saving profile error: %v", err)

cmd/keymasterd/2fa_u2f.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"strings"
 	"time"
@@ -166,14 +167,14 @@ func (state *RuntimeState) u2fRegisterResponse(w http.ResponseWriter, r *http.Re
 		CreatedAt:    time.Now(),
 		CreatorAddr:  r.RemoteAddr,
 	}
+	if authUser != assumedUser {
+		newReg.Name = fmt.Sprintf("Registered by %s", authUser)
+	}
 	newIndex := newReg.CreatedAt.Unix()
 	profile.U2fAuthData[newIndex] = &newReg
-	//registrations = append(registrations, *reg)
-	//counter = 0
-
 	logger.Printf("Registration success: %+v", reg)
-
 	profile.RegistrationChallenge = nil
+	profile.UserHasRegistered2ndFactor = true
 	err = state.SaveUserProfile(assumedUser, profile)
 	if err != nil {
 		logger.Printf("Saving profile error: %v", err)

cmd/keymasterd/app.go

@@ -130,6 +130,7 @@ type userProfile struct {
 	LastSuccessfullTOTPCounter int64
 	TOTPAuthData               map[int64]*totpAuthData
 	BootstrapOTP               bootstrapOTPData
+	UserHasRegistered2ndFactor bool
 }
 
 type localUserData struct {