[freenet-cvs] r15922 - trunk/freenet/src/freenet/node/fcp

[zot...@freenetproject.org]

Author: zothar
Date: 2007-11-22 15:00:17 +0000 (Thu, 22 Nov 2007)
New Revision: 15922

Modified:
   trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
   trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
   trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
   trunk/freenet/src/freenet/node/fcp/RemovePeer.java
Log:
Send ProtocolErrorMessage.MISSING_FIELD appropriately on the rest of the peer 
and peernote client to server FCP messages.  (Thanks to juergen Urner for 
catching the bug)

Modified: trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java     2007-11-22 
14:26:49 UTC (rev 15921)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java     2007-11-22 
15:00:17 UTC (rev 15922)
@@ -30,6 +30,9 @@
                        throw new 
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "ListPeer requires 
full access", fs.get("Identifier"), false);
                }
                String nodeIdentifier = fs.get("NodeIdentifier");
+               if( nodeIdentifier == null ) {
+                       throw new 
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Error: 
NodeIdentifier field missing", null, false);
+               }
                PeerNode pn = node.getPeerNode(nodeIdentifier);
                if(pn == null) {
                        FCPMessage msg = new 
UnknownNodeIdentifierMessage(nodeIdentifier);

Modified: trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java        
2007-11-22 14:26:49 UTC (rev 15921)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java        
2007-11-22 15:00:17 UTC (rev 15922)
@@ -31,6 +31,9 @@
                        throw new 
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "ListPeerNotes 
requires full access", fs.get("Identifier"), false);
                }
                String nodeIdentifier = fs.get("NodeIdentifier");
+               if( nodeIdentifier == null ) {
+                       throw new 
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Error: 
NodeIdentifier field missing", null, false);
+               }
                PeerNode pn = node.getPeerNode(nodeIdentifier);
                if(pn == null) {
                        FCPMessage msg = new 
UnknownNodeIdentifierMessage(nodeIdentifier);

Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeer.java  2007-11-22 14:26:49 UTC 
(rev 15921)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeer.java  2007-11-22 15:00:17 UTC 
(rev 15922)
@@ -32,6 +32,9 @@
                        throw new 
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "ModifyPeer 
requires full access", fs.get("Identifier"), false);
                }
                String nodeIdentifier = fs.get("NodeIdentifier");
+               if( nodeIdentifier == null ) {
+                       throw new 
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Error: 
NodeIdentifier field missing", null, false);
+               }
                PeerNode pn = node.getPeerNode(nodeIdentifier);
                if(pn == null) {
                        FCPMessage msg = new 
UnknownNodeIdentifierMessage(nodeIdentifier);

Modified: trunk/freenet/src/freenet/node/fcp/RemovePeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePeer.java  2007-11-22 14:26:49 UTC 
(rev 15921)
+++ trunk/freenet/src/freenet/node/fcp/RemovePeer.java  2007-11-22 15:00:17 UTC 
(rev 15922)
@@ -30,6 +30,9 @@
                        throw new 
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, NAME + " requires 
full access", null, false);
                }
                String nodeIdentifier = fs.get("NodeIdentifier");
+               if( nodeIdentifier == null ) {
+                       throw new 
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Error: 
NodeIdentifier field missing", null, false);
+               }
                PeerNode pn = node.getPeerNode(nodeIdentifier);
                if(pn == null) {
                        FCPMessage msg = new 
UnknownNodeIdentifierMessage(nodeIdentifier);