device enrollment: fix ip address (#3430)

This commit is contained in:
Caleb Doxsey 2022-06-16 11:30:38 -06:00 committed by GitHub
parent d1037d784a
commit a938a23ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 5 deletions

View file

@ -8,7 +8,6 @@ import (
"encoding/json"
"errors"
"fmt"
"net"
"net/http"
"net/url"
@ -523,9 +522,7 @@ func getOrCreateDeviceEnrollment(
deviceEnrollment.CredentialId = deviceCredentialID
deviceEnrollment.EnrolledAt = timestamppb.Now()
deviceEnrollment.UserAgent = r.UserAgent()
if ip, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
deviceEnrollment.IpAddress = ip
}
deviceEnrollment.IpAddress = httputil.GetClientIPAddress(r)
err := device.PutEnrollment(ctx, state.Client, deviceEnrollment)
if err != nil {