narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

add id="current" on every published PEP item (#3133)

Browse source 
This makes sure even misconfigured PEP nodes still get only one item, as
defined in XEP-0060 §12.20.
This commit is contained in:
linkmauve 2018-08-18 17:24:29 +01:00 committed by Daniel Gultsch
parent 02b7b0b4a6
commit 49349d898b
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/generator/IqGenerator.java
View file

@ -205,6 +205,7 @@ public class IqGenerator extends AbstractGenerator {
public IqPacket publishDeviceIds(final Set<Integer> ids, final Bundle publishOptions) { public IqPacket publishDeviceIds(final Set<Integer> ids, final Bundle publishOptions) {
final Element item = new Element("item"); final Element item = new Element("item");
item.setAttribute("id", "current");
final Element list = item.addChild("list", AxolotlService.PEP_PREFIX); final Element list = item.addChild("list", AxolotlService.PEP_PREFIX);
for (Integer id : ids) { for (Integer id : ids) {
final Element device = new Element("device"); final Element device = new Element("device");
@ -217,6 +218,7 @@ public class IqGenerator extends AbstractGenerator {
public IqPacket publishBundles(final SignedPreKeyRecord signedPreKeyRecord, final IdentityKey identityKey, public IqPacket publishBundles(final SignedPreKeyRecord signedPreKeyRecord, final IdentityKey identityKey,
final Set<PreKeyRecord> preKeyRecords, final int deviceId, Bundle publishOptions) { final Set<PreKeyRecord> preKeyRecords, final int deviceId, Bundle publishOptions) {
final Element item = new Element("item"); final Element item = new Element("item");
item.setAttribute("id", "current");
final Element bundle = item.addChild("bundle", AxolotlService.PEP_PREFIX); final Element bundle = item.addChild("bundle", AxolotlService.PEP_PREFIX);
final Element signedPreKeyPublic = bundle.addChild("signedPreKeyPublic"); final Element signedPreKeyPublic = bundle.addChild("signedPreKeyPublic");
signedPreKeyPublic.setAttribute("signedPreKeyId", signedPreKeyRecord.getId()); signedPreKeyPublic.setAttribute("signedPreKeyId", signedPreKeyRecord.getId());
@ -239,6 +241,7 @@ public class IqGenerator extends AbstractGenerator {
public IqPacket publishVerification(byte[] signature, X509Certificate[] certificates, final int deviceId) { public IqPacket publishVerification(byte[] signature, X509Certificate[] certificates, final int deviceId) {
final Element item = new Element("item"); final Element item = new Element("item");
item.setAttribute("id", "current");
final Element verification = item.addChild("verification", AxolotlService.PEP_PREFIX); final Element verification = item.addChild("verification", AxolotlService.PEP_PREFIX);
final Element chain = verification.addChild("chain"); final Element chain = verification.addChild("chain");
for (int i = 0; i < certificates.length; ++i) { for (int i = 0; i < certificates.length; ++i) {