Merge pull request #717 from slingamn/issue716

fix #716
This commit is contained in:
Shivaram Lingamneni
2019-12-25 21:11:53 -05:00
committed by GitHub
4 changed files with 28 additions and 8 deletions

View File

@@ -972,7 +972,7 @@ func (am *AccountManager) ChannelsForAccount(account string) (channels []string)
return unmarshalRegisteredChannels(channelStr)
}
func (am *AccountManager) AuthenticateByCertFP(client *Client) error {
func (am *AccountManager) AuthenticateByCertFP(client *Client, authzid string) error {
if client.certfp == "" {
return errAccountInvalidCredentials
}
@@ -992,6 +992,10 @@ func (am *AccountManager) AuthenticateByCertFP(client *Client) error {
return err
}
if authzid != "" && authzid != account {
return errAuthzidAuthcidMismatch
}
// ok, we found an account corresponding to their certificate
clientAccount, err := am.LoadAccount(account)
if err != nil {