Better error handling for failure to retrieve key from peer

htdocs/auth/xmlrpc/lib.php

@@ -591,6 +591,14 @@ class PluginAuthXmlrpc extends PluginAuth {
         $authinstance = new stdClass();
         $peer = new Peer();
 
+        if (false == $peer->findByWwwroot($values['wwwroot'])) {
+            try {
+                $peer->bootstrap($values['wwwroot'], null, $values['appname'], $values['institution']);
+            } catch (RemoteServerException $e) {
+                $form->set_error('wwwroot',get_string('cantretrievekey', 'auth'));
+            }
+        }
+
         //TODO: test values and set appropriate errors on form
     }
 

htdocs/lib/peer.php

@@ -217,6 +217,8 @@ class Peer {
                     $errcode = $e->getCode();
                     if ($errcode == 404) {
                         throw new RemoteServerException('404: Incorrect WWWRoot or Application: file not found.');
+                    } elseif($errcode == 704) {
+                        throw new RemoteServerException('Networking is disabled on the host at '.$this->wwwroot.'.');
                     }
                 } catch (Exception $e) {
                     throw new RemoteServerException('Error retrieving public key ');