@ -21,6 +21,7 @@ import (
func oxDeleteNodes ( jid string , client * xmpp . Client ,
func oxDeleteNodes ( jid string , client * xmpp . Client ,
iqc chan xmpp . IQ ) error {
iqc chan xmpp . IQ ) error {
nodeListRequest := etree . NewDocument ( )
nodeListRequest := etree . NewDocument ( )
nodeListRequest . WriteSettings . AttrSingleQuote = true
query := nodeListRequest . CreateElement ( "query" )
query := nodeListRequest . CreateElement ( "query" )
query . CreateAttr ( "xmlns" , nsDiscoItems )
query . CreateAttr ( "xmlns" , nsDiscoItems )
nlr , err := nodeListRequest . WriteToString ( )
nlr , err := nodeListRequest . WriteToString ( )
@ -53,6 +54,7 @@ func oxDeleteNodes(jid string, client *xmpp.Client,
continue
continue
}
}
deleteNodeRequest := etree . NewDocument ( )
deleteNodeRequest := etree . NewDocument ( )
deleteNodeRequest . WriteSettings . AttrSingleQuote = true
pubsub := deleteNodeRequest . CreateElement ( "pubsub" )
pubsub := deleteNodeRequest . CreateElement ( "pubsub" )
pubsub . CreateAttr ( "xmlns" , nsPubsubOwner )
pubsub . CreateAttr ( "xmlns" , nsPubsubOwner )
delete := pubsub . CreateElement ( "delete" )
delete := pubsub . CreateElement ( "delete" )
@ -231,6 +233,7 @@ func oxPublishPubKey(jid string, client *xmpp.Client, iqc chan xmpp.IQ,
}
}
pubKeyBase64 := base64 . StdEncoding . EncodeToString ( keySerialized )
pubKeyBase64 := base64 . StdEncoding . EncodeToString ( keySerialized )
root := etree . NewDocument ( )
root := etree . NewDocument ( )
root . WriteSettings . AttrSingleQuote = true
pubsub := root . CreateElement ( "pubsub" )
pubsub := root . CreateElement ( "pubsub" )
pubsub . CreateAttr ( "xmlns" , nsPubsub )
pubsub . CreateAttr ( "xmlns" , nsPubsub )
publish := pubsub . CreateElement ( "publish" )
publish := pubsub . CreateElement ( "publish" )
@ -278,6 +281,7 @@ func oxPublishPubKey(jid string, client *xmpp.Client, iqc chan xmpp.IQ,
return errors . New ( "couldn't successfully verify public key upload" )
return errors . New ( "couldn't successfully verify public key upload" )
}
}
root = etree . NewDocument ( )
root = etree . NewDocument ( )
root . WriteSettings . AttrSingleQuote = true
pubsub = root . CreateElement ( "pubsub" )
pubsub = root . CreateElement ( "pubsub" )
pubsub . CreateAttr ( "xmlns" , nsPubsub )
pubsub . CreateAttr ( "xmlns" , nsPubsub )
publish = pubsub . CreateElement ( "publish" )
publish = pubsub . CreateElement ( "publish" )
@ -481,6 +485,7 @@ func oxGenPrivKey(jid string, client *xmpp.Client, iqc chan xmpp.IQ,
func oxRecvPublicKeys ( client * xmpp . Client , iqc chan xmpp . IQ , recipient string ,
func oxRecvPublicKeys ( client * xmpp . Client , iqc chan xmpp . IQ , recipient string ,
fingerprint string ) ( * crypto . KeyRing , error ) {
fingerprint string ) ( * crypto . KeyRing , error ) {
opkr := etree . NewDocument ( )
opkr := etree . NewDocument ( )
opkr . WriteSettings . AttrSingleQuote = true
opkrPs := opkr . CreateElement ( "pubsub" )
opkrPs := opkr . CreateElement ( "pubsub" )
opkrPs . CreateAttr ( "xmlns" , nsPubsub )
opkrPs . CreateAttr ( "xmlns" , nsPubsub )
opkrPsItems := opkrPs . CreateElement ( "items" )
opkrPsItems := opkrPs . CreateElement ( "items" )
@ -555,6 +560,7 @@ func oxGetPublicKeyRing(client *xmpp.Client, iqc chan xmpp.IQ,
}
}
oxPubKeyListReq := etree . NewDocument ( )
oxPubKeyListReq := etree . NewDocument ( )
oxPubKeyListReq . WriteSettings . AttrSingleQuote = true
oxPubKeyListReqPs := oxPubKeyListReq . CreateElement ( "pubsub" )
oxPubKeyListReqPs := oxPubKeyListReq . CreateElement ( "pubsub" )
oxPubKeyListReqPs . CreateAttr ( "xmlns" , nsPubsub )
oxPubKeyListReqPs . CreateAttr ( "xmlns" , nsPubsub )
oxPubKeyListReqPsItems := oxPubKeyListReqPs . CreateElement ( "items" )
oxPubKeyListReqPsItems := oxPubKeyListReqPs . CreateElement ( "items" )
@ -708,6 +714,7 @@ func oxEncrypt(client *xmpp.Client, iqc chan xmpp.IQ, oxPrivKey *crypto.Key,
}
}
}
}
oxCryptMessage := etree . NewDocument ( )
oxCryptMessage := etree . NewDocument ( )
oxCryptMessage . WriteSettings . AttrSingleQuote = true
oxCryptMessageSc := oxCryptMessage . CreateElement ( "signcrypt" )
oxCryptMessageSc := oxCryptMessage . CreateElement ( "signcrypt" )
oxCryptMessageSc . CreateAttr ( "xmlns" , nsOx )
oxCryptMessageSc . CreateAttr ( "xmlns" , nsOx )
oxCryptMessageScTo := oxCryptMessageSc . CreateElement ( "to" )
oxCryptMessageScTo := oxCryptMessageSc . CreateElement ( "to" )
@ -730,6 +737,7 @@ func oxEncrypt(client *xmpp.Client, iqc chan xmpp.IQ, oxPrivKey *crypto.Key,
return "error" , err
return "error" , err
}
}
om := etree . NewDocument ( )
om := etree . NewDocument ( )
om . WriteSettings . AttrSingleQuote = true
omMessage := om . CreateElement ( "message" )
omMessage := om . CreateElement ( "message" )
omMessage . CreateAttr ( "to" , recipient )
omMessage . CreateAttr ( "to" , recipient )
omMessage . CreateAttr ( "id" , getID ( ) )
omMessage . CreateAttr ( "id" , getID ( ) )