Merge branch 'feature/xep-0373' into premerge

xep-0373.xml

@@ -46,6 +46,14 @@
     <email>look@my.amazin.horse</email>
     <jid>valodim@stratum0.org</jid>
   </author>
+  <revision>
+    <version>0.7.0</version>
+    <date>2021-05-04</date>
+    <initials>ps</initials>
+    <remark>
+      <p>Recommend PubSub access model 'open' for public key data node and metadata node.</p>
+    </remark>
+  </revision>
   <revision>
     <version>0.6.0</version>
     <date>2020-11-22</date>
@@ -337,6 +345,12 @@
     public key using Base64. The id of the node MUST be "urn:xmpp:openpgp:0:public-keys:" followed
     by the fingerprint string of the OpenPGP public-key contained in the data node.</p>
 
+    <p>In absence of a use-case specific access model, it is RECOMMENDED to use the 'open' access
+    model for the public key data node in order to give entities without presence subscription
+    read access to the public key.</p>
+
+    <p>The access model can be changed efficiently by using publish-options.</p>
+
     <p>The <em>OpenPGP v4 fingerprint string</em> is obtained as follows: First the raw bytes of the
     fingerprint are computed as specified in <cite>RFC 4880 § 12.2.</cite>. Then the bytes are
     encoded as a hexadecimal string using upper case characters<note>This matches the representation
@@ -361,6 +375,16 @@
         </pubkey>
       </item>
     </publish>
+    <publish-options>
+      <x xmlns='jabber:x:data' type='submit'>
+        <field var='FORM_TYPE' type='hidden'>
+          <value>http://jabber.org/protocol/pubsub#publish-options</value>
+        </field>
+        <field var='pubsub#access_model'>
+          <value>open</value>
+        </field>
+      </x>
+    </publish-options>
   </pubsub>
 </iq>]]></example>
 
@@ -372,6 +396,10 @@
     OpenPGP key fingerprint to the metadata node, the publisher MUST ensure that the public key is available
     at the corresponding data node.</p>
 
+    <p>Just like with the public key data node, in absence of a use-case specific access model,
+    it is RECOMMENDED to set the access model of the metadata node to 'open', such that entities
+    without mutual presence subscription are still able to access the node items.</p>
+
     <p> The ID of the metadata node is 'urn:xmpp:openpgp:0:public-keys'. It contains a
     &lt;public-keys-list/&gt; element qualified by the 'urn:xmpp:openpgp:0' namespace containing one
     or more &lt;pubkey-metadata/&gt; elements. Every pubkey-metadata element MUST have a
@@ -396,6 +424,16 @@
         </public-keys-list>
       </item>
     </publish>
+    <publish-options>
+      <x xmlns='jabber:x:data' type='submit'>
+        <field var='FORM_TYPE' type='hidden'>
+          <value>http://jabber.org/protocol/pubsub#publish-options</value>
+        </field>
+        <field var='pubsub#access_model'>
+          <value>open</value>
+        </field>
+      </x>
+    </publish-options>
   </pubsub>
 </iq>]]></example>