diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-08-23 14:08:58 +0200 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-08-23 14:08:58 +0200 |
| commit | 5839eedd22e28a281f3faa90433f0452ca31b385 (patch) | |
| tree | 71e4ed1fd7a5bcf1da1813891197aeaaed359be2 /internal/discovery/discovery.go | |
| parent | d41af72a9673728cfe9390e31cb4e67da31fc355 (diff) | |
Formatting: Run golines
Diffstat (limited to 'internal/discovery/discovery.go')
| -rw-r--r-- | internal/discovery/discovery.go | 59 |
1 files changed, 48 insertions, 11 deletions
diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go index 79e7230..415c71a 100644 --- a/internal/discovery/discovery.go +++ b/internal/discovery/discovery.go @@ -40,7 +40,13 @@ func getDiscoFile(jsonFile string, previousVersion uint64, structure interface{} // Verify signature // Set this to true when we want to force prehash forcePrehash := false - verifySuccess, verifyErr := verify.Verify(string(sigBody), fileBody, jsonFile, previousVersion, forcePrehash) + verifySuccess, verifyErr := verify.Verify( + string(sigBody), + fileBody, + jsonFile, + previousVersion, + forcePrehash, + ) if !verifySuccess || verifyErr != nil { return "", &types.WrappedErrorMessage{Message: errorMessage, Err: verifyErr} @@ -75,22 +81,34 @@ func (discovery *Discovery) GetSecureLocationList() []string { return locations } -func (discovery *Discovery) GetServerByURL(url string, _type string) (*types.DiscoveryServer, error) { +func (discovery *Discovery) GetServerByURL( + url string, + _type string, +) (*types.DiscoveryServer, error) { for _, server := range discovery.Servers.List { if server.BaseURL == url && server.Type == _type { return &server, nil } } - return nil, &types.WrappedErrorMessage{Message: "failed getting server by URL from discovery", Err: &GetServerByURLNotFoundError{URL: url, Type: _type}} + return nil, &types.WrappedErrorMessage{ + Message: "failed getting server by URL from discovery", + Err: &GetServerByURLNotFoundError{URL: url, Type: _type}, + } } -func (discovery *Discovery) GetServerByCountryCode(code string, _type string) (*types.DiscoveryServer, error) { +func (discovery *Discovery) GetServerByCountryCode( + code string, + _type string, +) (*types.DiscoveryServer, error) { for _, server := range discovery.Servers.List { if server.CountryCode == code && server.Type == _type { return &server, nil } } - return nil, &types.WrappedErrorMessage{Message: "failed getting server by country code from discovery", Err: &GetServerByCountryCodeNotFoundError{CountryCode: code, Type: _type}} + return nil, &types.WrappedErrorMessage{ + Message: "failed getting server by country code from discovery", + Err: &GetServerByCountryCodeNotFoundError{CountryCode: code, Type: _type}, + } } func (discovery *Discovery) getOrgByID(orgID string) (*types.DiscoveryOrganization, error) { @@ -99,10 +117,15 @@ func (discovery *Discovery) getOrgByID(orgID string) (*types.DiscoveryOrganizati return &organization, nil } } - return nil, &types.WrappedErrorMessage{Message: "failed getting Secure Internet Home URL from discovery", Err: &GetOrgByIDNotFoundError{ID: orgID}} + return nil, &types.WrappedErrorMessage{ + Message: "failed getting Secure Internet Home URL from discovery", + Err: &GetOrgByIDNotFoundError{ID: orgID}, + } } -func (discovery *Discovery) GetSecureHomeArgs(orgID string) (*types.DiscoveryOrganization, *types.DiscoveryServer, error) { +func (discovery *Discovery) GetSecureHomeArgs( + orgID string, +) (*types.DiscoveryOrganization, *types.DiscoveryServer, error) { errorMessage := "failed getting Secure Internet Home arguments from discovery" org, orgErr := discovery.getOrgByID(orgID) @@ -147,7 +170,10 @@ func (discovery *Discovery) GetOrganizationsList() (string, error) { body, bodyErr := getDiscoFile(file, discovery.Organizations.Version, &discovery.Organizations) if bodyErr != nil { // Return previous with an error - return discovery.Organizations.RawString, &types.WrappedErrorMessage{Message: "failed getting organizations in Discovery", Err: bodyErr} + return discovery.Organizations.RawString, &types.WrappedErrorMessage{ + Message: "failed getting organizations in Discovery", + Err: bodyErr, + } } discovery.Organizations.RawString = body discovery.Organizations.Timestamp = util.GetCurrentTime() @@ -163,7 +189,10 @@ func (discovery *Discovery) GetServersList() (string, error) { body, bodyErr := getDiscoFile(file, discovery.Servers.Version, &discovery.Servers) if bodyErr != nil { // Return previous with an error - return discovery.Servers.RawString, &types.WrappedErrorMessage{Message: "failed getting servers in Discovery", Err: bodyErr} + return discovery.Servers.RawString, &types.WrappedErrorMessage{ + Message: "failed getting servers in Discovery", + Err: bodyErr, + } } // Update servers timestamp discovery.Servers.RawString = body @@ -185,7 +214,11 @@ type GetServerByURLNotFoundError struct { } func (e GetServerByURLNotFoundError) Error() string { - return fmt.Sprintf("No institute access server found in organizations with URL %s and type %s", e.URL, e.Type) + return fmt.Sprintf( + "No institute access server found in organizations with URL %s and type %s", + e.URL, + e.Type, + ) } type GetServerByCountryCodeNotFoundError struct { @@ -194,7 +227,11 @@ type GetServerByCountryCodeNotFoundError struct { } func (e GetServerByCountryCodeNotFoundError) Error() string { - return fmt.Sprintf("No institute access server found in organizations with country code %s and type %s", e.CountryCode, e.Type) + return fmt.Sprintf( + "No institute access server found in organizations with country code %s and type %s", + e.CountryCode, + e.Type, + ) } type GetSecureHomeArgsNotFoundError struct { |
