Default to external IP

kylecarbs · kylecarbs · commit 771cae8f3b3d · 2022-06-22T16:48:25.000Z
diff --git a/coderd/httpmw/apikey.go b/coderd/httpmw/apikey.go
@@ -168,6 +168,9 @@ func ExtractAPIKey(db database.Store, oauth *OAuth2Configs) func(http.Handler) h
 			if now.Sub(key.LastUsed) > time.Hour {
 				key.LastUsed = now
 				remoteIP := net.ParseIP(r.RemoteAddr)
+				if remoteIP == nil {
+					remoteIP = net.IPv4(0, 0, 0, 0)
+				}
 				key.IPAddress = pqtype.Inet{
 					IPNet: net.IPNet{
 						IP:   remoteIP,
diff --git a/coderd/users.go b/coderd/users.go
@@ -801,6 +801,9 @@ func (api *API) createAPIKey(rw http.ResponseWriter, r *http.Request, params dat
 	}
 
 	ip := net.ParseIP(r.RemoteAddr)
+	if ip == nil {
+		ip = net.IPv4(0, 0, 0, 0)
+	}
 	key, err := api.Database.InsertAPIKey(r.Context(), database.InsertAPIKeyParams{
 		ID:              keyID,
 		UserID:          params.UserID,
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -175,8 +175,9 @@ func TestPostLogin(t *testing.T) {
 		require.NoError(t, err, "fetch api key")
 
 		err = api.Database.UpdateAPIKeyByID(ctx, database.UpdateAPIKeyByIDParams{
-			ID:       apiKey.ID,
-			LastUsed: apiKey.LastUsed,
+			ID:        apiKey.ID,
+			LastUsed:  apiKey.LastUsed,
+			IPAddress: apiKey.IPAddress,
 			// This should cause a refresh
 			ExpiresAt:         apiKey.ExpiresAt.Add(time.Hour * -2),
 			OAuthAccessToken:  apiKey.OAuthAccessToken,

Original file line number	Diff line number	Diff line change
`@@ -801,6 +801,9 @@ func (api API) createAPIKey(rw http.ResponseWriter, r http.Request, params dat`
`801`	`801`	`}`
`802`	`802`
`803`	`803`	`ip := net.ParseIP(r.RemoteAddr)`
	`804`	`+ if ip == nil {`
	`805`	`+ ip = net.IPv4(0, 0, 0, 0)`
	`806`	`+ }`
`804`	`807`	`key, err := api.Database.InsertAPIKey(r.Context(), database.InsertAPIKeyParams{`
`805`	`808`	`ID: keyID,`
`806`	`809`	`UserID: params.UserID,`