Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix conflict resolution logic for
read_only
and hide_passwords
flags
For one of these flags to be in effect for a cipher, upstream requires all of (rather than any of) the collections the cipher is in to have that flag set. Also, some of the logic for loading access restrictions was wrong. I think that only malicious clients that also had knowledge of the UUIDs of ciphers they didn't have access to would have been able to take advantage of that.
- Loading branch information