MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Less error spam for things not actually broken

Browse Source
This commit is contained in:
Dane Everitt 2020-04-25 11:49:21 -07:00
parent 6395b8b56c
commit b0fa5abe31
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/sftp_endpoints.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/pterodactyl/sftp-server" "github.com/pterodactyl/sftp-server"
"go.uber.org/zap"
) )
func (r *PanelRequest) ValidateSftpCredentials(request sftp_server.AuthenticationRequest) (*sftp_server.AuthenticationResponse, error) { func (r *PanelRequest) ValidateSftpCredentials(request sftp_server.AuthenticationRequest) (*sftp_server.AuthenticationResponse, error) {
@ -21,11 +22,16 @@ func (r *PanelRequest) ValidateSftpCredentials(request sftp_server.Authenticatio
r.Response = resp r.Response = resp
if r.HasError() { if r.HasError() {
if r.HttpResponseCode() == 403 { if r.HttpResponseCode() >= 400 && r.HttpResponseCode() < 500 {
return nil, sftp_server.InvalidCredentialsError{} zap.S().Debugw("failed to validate server credentials for SFTP", zap.String("error", r.Error().String()))
return nil, new(sftp_server.InvalidCredentialsError)
} }
return nil, errors.WithStack(errors.New(r.Error().String())) rerr := errors.New(r.Error().String())
zap.S().Warnw("error validating SFTP credentials", zap.Error(rerr))
return nil, rerr
} }
response := new(sftp_server.AuthenticationResponse) response := new(sftp_server.AuthenticationResponse)