mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow verification without specifying a server name"

Browse source 
This reverts commit fd27afbf82.
This commit is contained in:
Brendan Abolivier 2017-09-07 11:19:12 +01:00
parent 4d387c02d7
commit d16d1c6d34
1 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/github.com/matrix-org/dendrite/common/threepid/checksignature.go
View file

@ -30,37 +30,18 @@ import (
// Returns nil if all the verifications succeeded. // Returns nil if all the verifications succeeded.
// Returns an error if something failed in the process. // Returns an error if something failed in the process.
func CheckIDServerSignatures(idServer string, signatures map[string]map[string]string, marshalledBody []byte) error { func CheckIDServerSignatures(idServer string, signatures map[string]map[string]string, marshalledBody []byte) error {
if len(idServer) > 0 { // TODO: Check if the domain is part of a list of trusted ID servers
// TODO: Check if the domain is part of a list of trusted ID servers idServerSignatures, ok := signatures[idServer]
idServerSignatures, ok := signatures[idServer] if !ok {
if !ok { return errors.New("No signature for domain " + idServer)
return errors.New("No signature for domain " + idServer)
}
return retrieveAndVerify(idServer, idServerSignatures, marshalledBody)
} }
for domain, sigs := range signatures { for keyID := range idServerSignatures {
if err := retrieveAndVerify(domain, sigs, marshalledBody); err != nil { pubKey, err := queryIDServerPubKey(idServer, keyID)
return err
}
}
return nil
}
// retrieveAndVerify iterates over a given set of signatures and, for each of them,
// requests the corresponding public key to the identity server and verify the
// signature.
// Returns an error if the verification failed or if something went wrong in the
// process.
func retrieveAndVerify(domain string, signatures map[string]string, marshalledBody []byte) error {
for keyID := range signatures {
pubKey, err := queryIDServerPubKey(domain, keyID)
if err != nil { if err != nil {
return err return err
} }
if err = gomatrixserverlib.VerifyJSON(domain, gomatrixserverlib.KeyID(keyID), pubKey, marshalledBody); err != nil { if err = gomatrixserverlib.VerifyJSON(idServer, gomatrixserverlib.KeyID(keyID), pubKey, marshalledBody); err != nil {
return err return err
} }
} }