Skip to content

Commit

Permalink
Do not log errors triggered by bad input as warning (#268)
Browse files Browse the repository at this point in the history
Also make it explicit that Trickle ICE is not supported.
  • Loading branch information
biglittlebigben authored May 17, 2024
1 parent 7780946 commit 3f2f2fc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkg/whip/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ func (s *WHIPServer) Start(
w.Header().Set("Access-Control-Allow-Origin", "*")

if r.Header.Get("If-Match") != "*" {
logger.Warnw("WHIP ICE Restart must have If-Match='*'", err, "streamKey", streamKey, "resourceID", resourceID)
logger.Infow("WHIP client attempted Trickle-ICE", "streamKey", streamKey, "resourceID", resourceID)
w.WriteHeader(http.StatusUnprocessableEntity)
_, _ = w.Write([]byte("ICE Restart Request must have If-Match='*' Header"))
_, _ = w.Write([]byte("WHIP Trickle-ICE not supported"))
return
}

body, err := io.ReadAll(r.Body)
if err != nil {
logger.Warnw("WHIP ICE Restart failed to read body", err, "streamKey", streamKey, "resourceID", resourceID)
logger.Infow("WHIP ICE Restart failed to read body", "error", err, "streamKey", streamKey, "resourceID", resourceID)
s.handleError(errors.ErrInvalidWHIPRestartRequest, w)
return
}
Expand All @@ -180,13 +180,13 @@ func (s *WHIPServer) Start(
// https://www.ietf.org/archive/id/draft-ietf-wish-whip-14.html#name-ice-restarts
userFragment, password, err := extractICEDetails(body)
if err != nil {
logger.Warnw("WHIP ICE Restart failed to unmarshal SDP", err, "streamKey", streamKey, "resourceID", resourceID)
logger.Infow("WHIP ICE Restart failed to unmarshal SDP", "error", err, "streamKey", streamKey, "resourceID", resourceID)
s.handleError(errors.ErrInvalidWHIPRestartRequest, w)
return
}

if userFragment == "" || password == "" {
logger.Warnw("WHIP ICE Restart failed to extract ice-ufrag/ice-pwd", err, "streamKey", streamKey, "resourceID", resourceID)
logger.Infow("WHIP ICE Restart failed to extract ice-ufrag/ice-pwd", "error", err, "streamKey", streamKey, "resourceID", resourceID)
s.handleError(errors.ErrInvalidWHIPRestartRequest, w)
return
}
Expand All @@ -199,7 +199,7 @@ func (s *WHIPServer) Start(
}, psrpc.WithRequestTimeout(5*time.Second))
if err == psrpc.ErrNoResponse {
s.handleError(errors.ErrIngressNotFound, w)
logger.Warnw("WHIP ICE Restart failed no such session", err, "streamKey", streamKey, "resourceID", resourceID)
logger.Infow("WHIP ICE Restart failed no such session", "error", err, "streamKey", streamKey, "resourceID", resourceID)
return
}

Expand Down

0 comments on commit 3f2f2fc

Please sign in to comment.