fixed ArrayIndexOutOfBoundsException in signing

Before writing data to a buffer, its available size should be checked.
ymnk · May 14, 2013 · 58ccf74 · 58ccf74
1 parent c23826f
commit 58ccf74
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 12 deletions.
diff --git a/README b/README
@@ -39,7 +39,7 @@ Examples
     $ cd examples
     $ mvn compile
     $ mvn exec:java \
-      -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.UsingJSchWithAgentProxy" \
+      -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.JSchWithAgentProxy" \
       -Dexec.args="foo@bar.com"
 
 

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ This software is licensed under [BSD style license](https://github.com/ymnk/jsch
 		$ cd examples
 		$ mvn compile
 		$ mvn exec:java \
-		  -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.UsingJSchWithAgentProxy" \
+		  -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.JSchWithAgentProxy" \
 		  -Dexec.args="foo@bar.com"
 
 ## Dependencies

diff --git a/examples/README b/examples/README
@@ -19,5 +19,5 @@ README
   $ cd examples
   $ mvn compile
   $ mvn exec:java \
-      -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.UsingJSchWithAgentProxy" \
+      -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.JSchWithAgentProxy" \
       -Dexec.args="foo@bar.com"
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.jcraft</groupId>
   <artifactId>jsch.agentproxy.examples</artifactId>
-  <version>0.0.5</version>
+  <version>0.0.6</version>
   <name>examples to demonstrate how to use jsch-agent-proxy</name>
 
   <dependencies>

diff --git a/jsch-agent-proxy-core/pom.xml b/jsch-agent-proxy-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
   </parent>
 
   <artifactId>jsch.agentproxy.core</artifactId>

diff --git a/jsch-agent-proxy-core/src/main/java/com/jcraft/jsch/agentproxy/AgentProxy.java b/jsch-agent-proxy-core/src/main/java/com/jcraft/jsch/agentproxy/AgentProxy.java
@@ -121,7 +121,9 @@ public synchronized byte[] sign(byte[] blob, byte[] data) {
     byte code1 = SSH2_AGENTC_SIGN_REQUEST;
     byte code2 = SSH2_AGENT_SIGN_RESPONSE;
 
+    int required_size = 1 + 4*4 + blob.length + data.length;
     buffer.reset();
+    buffer.checkFreeSize(required_size);
     buffer.putByte(code1);
     buffer.putString(blob);
     buffer.putString(data);
@@ -150,7 +152,9 @@ public synchronized byte[] sign(byte[] blob, byte[] data) {
   public synchronized boolean removeIdentity(byte[] blob) {
     byte code1 = SSH2_AGENTC_REMOVE_IDENTITY;
 
+    int required_size = 1 + 4*2 + blob.length;
     buffer.reset();
+    buffer.checkFreeSize(required_size);
     buffer.putByte(code1);
     buffer.putString(blob);
     buffer.insertLength();
@@ -189,7 +193,9 @@ public synchronized void removeAllIdentities() {
   public synchronized boolean addIdentity(byte[] identity) {
     byte code1 = SSH2_AGENTC_ADD_IDENTITY;
 
+    int required_size = 1 + 4 + identity.length;
     buffer.reset();
+    buffer.checkFreeSize(required_size);
     buffer.putByte(code1);
     buffer.putByte(identity);
     buffer.insertLength();

diff --git a/jsch-agent-proxy-jsch/pom.xml b/jsch-agent-proxy-jsch/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
   </parent>
 
   <artifactId>jsch.agentproxy.jsch</artifactId>

diff --git a/jsch-agent-proxy-pageant/pom.xml b/jsch-agent-proxy-pageant/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
   </parent>
 
   <artifactId>jsch.agentproxy.pageant</artifactId>

diff --git a/jsch-agent-proxy-sshagent/pom.xml b/jsch-agent-proxy-sshagent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
   </parent>
 
   <artifactId>jsch.agentproxy.sshagent</artifactId>

diff --git a/jsch-agent-proxy-usocket-jna/pom.xml b/jsch-agent-proxy-usocket-jna/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-jna</artifactId>

diff --git a/jsch-agent-proxy-usocket-junixsocket/pom.xml b/jsch-agent-proxy-usocket-junixsocket/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-junixsocket</artifactId>

diff --git a/jsch-agent-proxy-usocket-nc/pom.xml b/jsch-agent-proxy-usocket-nc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-nc</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>com.jcraft</groupId>
   <artifactId>jsch.agentproxy</artifactId>
-  <version>0.0.5</version>
+  <version>0.0.6</version>
   <packaging>pom</packaging>
   <name>jsch-agent-proxy: a parent of modules</name>