fix lint error
Kim committed
Mar 30, 2026 at 16:20 UTC
0ce3dca96d1d853973a40f7d38a1e22a447085d9
2 files changed
+18
-18
portal/api_server.go
+17
-17
@@ -197,8 +197,8 @@ func (s *Server) handleRegister(w http.ResponseWriter, r *http.Request) {
197
198
challenge, err := s.registry.consumeVerifiedRegisterChallenge(req)
199
if err != nil {
200
- switch err {
201
- case auth.ErrInvalidSignature:
200
+ switch {
201
+ case errors.Is(err, auth.ErrInvalidSignature):
202
utils.WriteAPIError(w, http.StatusForbidden, types.APIErrorCodeUnauthorized, err.Error())
203
default:
204
utils.WriteAPIError(w, http.StatusBadRequest, types.APIErrorCodeInvalidRequest, err.Error())
@@ -208,18 +208,18 @@ func (s *Server) handleRegister(w http.ResponseWriter, r *http.Request) {
208
209
resp, err := s.registerLease(challenge.Request, clientIP, req.ReportedIP)
210
if err != nil {
211
- switch err {
212
- case errFeatureUnavailable:
211
+ switch {
212
+ case errors.Is(err, errFeatureUnavailable):
213
utils.WriteAPIError(w, http.StatusServiceUnavailable, types.APIErrorCodeFeatureUnavailable, err.Error())
214
- case errHostnameConflict:
214
+ case errors.Is(err, errHostnameConflict):
215
utils.WriteAPIError(w, http.StatusConflict, types.APIErrorCodeHostnameConflict, err.Error())
216
- case errIPBanned:
216
+ case errors.Is(err, errIPBanned):
217
utils.WriteAPIError(w, http.StatusForbidden, types.APIErrorCodeIPBanned, err.Error())
218
- case transport.ErrPortExhausted:
218
+ case errors.Is(err, transport.ErrPortExhausted):
219
utils.WriteAPIError(w, http.StatusServiceUnavailable, types.APIErrorCodeUDPPortExhausted, err.Error())
220
- case errUDPDisabled:
220
+ case errors.Is(err, errUDPDisabled):
221
utils.WriteAPIError(w, http.StatusForbidden, types.APIErrorCodeUDPDisabled, err.Error())
222
- case errUDPCapacityExceeded:
222
+ case errors.Is(err, errUDPCapacityExceeded):
223
utils.WriteAPIError(w, http.StatusServiceUnavailable, types.APIErrorCodeUDPCapacityExceeded, err.Error())
224
default:
225
utils.WriteAPIError(w, http.StatusBadRequest, types.APIErrorCodeInvalidRequest, err.Error())
@@ -269,12 +269,12 @@ func (s *Server) handleRegisterChallenge(w http.ResponseWriter, r *http.Request)
269
270
resp, err := s.registry.issueRegisterChallenge(req, domain, registerURI)
271
if err != nil {
272
- switch err {
273
- case errFeatureUnavailable:
272
+ switch {
273
+ case errors.Is(err, errFeatureUnavailable):
274
utils.WriteAPIError(w, http.StatusServiceUnavailable, types.APIErrorCodeFeatureUnavailable, err.Error())
275
- case errUDPDisabled:
275
+ case errors.Is(err, errUDPDisabled):
276
utils.WriteAPIError(w, http.StatusForbidden, types.APIErrorCodeUDPDisabled, err.Error())
277
- case errUDPCapacityExceeded:
277
+ case errors.Is(err, errUDPCapacityExceeded):
278
utils.WriteAPIError(w, http.StatusServiceUnavailable, types.APIErrorCodeUDPCapacityExceeded, err.Error())
279
default:
280
utils.WriteAPIError(w, http.StatusBadRequest, types.APIErrorCodeInvalidRequest, err.Error())
@@ -315,8 +315,8 @@ func (s *Server) handleRenew(w http.ResponseWriter, r *http.Request) {
315
}
316
record, err := s.registry.Renew(strings.TrimSpace(req.LeaseID), ttl, clientIP, utils.SanitizeReportedIP(req.ReportedIP))
317
if err != nil {
318
- switch err {
319
- case errLeaseNotFound:
318
+ switch {
319
+ case errors.Is(err, errLeaseNotFound):
320
utils.WriteAPIError(w, http.StatusNotFound, types.APIErrorCodeLeaseNotFound, err.Error())
321
default:
322
utils.WriteAPIError(w, http.StatusBadRequest, types.APIErrorCodeInvalidRequest, err.Error())
@@ -354,8 +354,8 @@ func (s *Server) handleUnregister(w http.ResponseWriter, r *http.Request) {
354
355
record, err := s.registry.Unregister(strings.TrimSpace(req.LeaseID))
356
if err != nil {
357
- switch err {
358
- case errLeaseNotFound:
357
+ switch {
358
+ case errors.Is(err, errLeaseNotFound):
359
utils.WriteAPIError(w, http.StatusNotFound, types.APIErrorCodeLeaseNotFound, err.Error())
360
default:
361
utils.WriteAPIError(w, http.StatusBadRequest, types.APIErrorCodeInvalidRequest, err.Error())
portal/auth/auth.go
+1
-1
@@ -269,7 +269,7 @@ func VerifyLeaseAccessToken(token, publicKeyHex, issuer, leaseID string, now tim
269
if strings.TrimSpace(leaseID) != "" && claims.LeaseID != strings.TrimSpace(leaseID) {
270
return LeaseAccessTokenClaims{}, errors.New("lease access token lease id does not match request")
271
}
272
- if err := claims.Claims.ValidateWithLeeway(jwt.Expected{
272
+ if err := claims.ValidateWithLeeway(jwt.Expected{
273
Issuer: strings.TrimSpace(issuer),
274
AnyAudience: jwt.Audience{leaseAccessTokenAudience},
275
Time: now.UTC(),