anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

support jpeg pep avatars + actually check hash

Browse source
This commit is contained in:
Daniel Gultsch 2018-11-27 21:13:42 +01:00 committed by fiaxh
parent 34ab3de0ba
commit 542744ade2
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xmpp-vala/src/module/xep/0084_user_avatars.vala
View file

@ -40,7 +40,8 @@ namespace Xmpp.Xep.UserAvatars {
public void on_pupsub_event(XmppStream stream, Jid jid, string id, StanzaNode? node) { public void on_pupsub_event(XmppStream stream, Jid jid, string id, StanzaNode? node) {
StanzaNode? info_node = node.get_subnode("info", NS_URI_METADATA); StanzaNode? info_node = node.get_subnode("info", NS_URI_METADATA);
if (info_node == null || info_node.get_attribute("type") != "image/png") return; string? type = info_node == null ? null : info_node.get_attribute("type");
if (type != "image/png" && type != "image/jpeg") return;
if (storage.has_image(id)) { if (storage.has_image(id)) {
stream.get_module(Module.IDENTITY).received_avatar(stream, jid, id); stream.get_module(Module.IDENTITY).received_avatar(stream, jid, id);
} else { } else {
@ -52,8 +53,16 @@ namespace Xmpp.Xep.UserAvatars {
public override string get_id() { return IDENTITY.id; } public override string get_id() { return IDENTITY.id; }
private void on_pubsub_data_response(XmppStream stream, Jid jid, string? id, StanzaNode? node) { private void on_pubsub_data_response(XmppStream stream, Jid jid, string? id, StanzaNode? node) {
if (node == null) return; if (node == null || id == null) {
storage.store(id, Base64.decode(node.get_string_content())); return;
}
uint8[] image = Base64.decode(node.get_string_content());
string sha1 = Checksum.compute_for_data(ChecksumType.SHA1, image);
if (sha1 != id) {
warning("sha sum did not match for avatar from "+jid.to_string()+" expected="+id+", actual="+sha1);
return;
}
storage.store(id, image);
stream.get_module(Module.IDENTITY).received_avatar(stream, jid, id); stream.get_module(Module.IDENTITY).received_avatar(stream, jid, id);
} }
} }