Changeset 257 for tools

Timestamp:

02/02/09 15:51:55 (14 months ago)

Author:

anton

Message:

Logging fixed

Location:

tools/routingservice/trunk/src/jp/co/orkney/restlet

Files:

• WebRouting.java (modified) (1 diff)
• security/SecurityHelper.java (modified) (6 diffs)

tools/routingservice/trunk/src/jp/co/orkney/restlet/WebRouting.java

@@ -210 +210 @@
                                                                 try
                                                                 {
-                                                                        if (!SecurityHelper.checkAPIKey((String) keys.get(clientId.toUpperCase()), encKey, signature, clientId))
+                                                                        if (!SecurityHelper.checkAPIKey((String) keys.get(clientId.toUpperCase()), encKey, signature, clientId, log))
                                                                         {
                                                                                 response.setStatus(Status.CLIENT_ERROR_FORBIDDEN);

tools/routingservice/trunk/src/jp/co/orkney/restlet/security/SecurityHelper.java

@@ -41 +41 @@
 
     public static boolean checkAPIKey(String apiKey, String encKey,
-            String signature, String clientId) throws IOException,
+            String signature, String clientId, Log log) throws IOException,
             KeyStoreException, CertificateException, NoSuchAlgorithmException,
             NoSuchPaddingException, NoSuchProviderException,
@@ -92 +92 @@
         verifies = sig.verify(sigToVerify);
 
-        System.out.println("signature verifies: " + verifies);
+        //System.out.println("signature verifies: " + verifies);
+        log.write("signature verifies: " + verifies, 2);
 
         // byte[] text = encKey.substring(0,176).getBytes();
         byte[] text = b64.decodeBuffer(encKey);
 
-        System.out.println("Encrypting message...");
+        //System.out.println("Encrypting message...");
+        log.write("Encrypting message...", 2);
 
         // text = crypt(c, priKey, text, Cipher.DECRYPT_MODE);
-        text = encryptDecrypt("DECRYPT", text, priKey);
+        text = encryptDecrypt("DECRYPT", text, priKey, log);
 
         String decKey = new String(text);
-        System.out.println("text = " + decKey);
+        //System.out.println("text = " + decKey);
+        log.write("text = " + decKey, 2);
 
         isValid = apiKey.equals(decKey);
@@ -247 +250 @@
     }
 
-    public static byte[] encryptDecrypt(String type, byte[] data, Key secretKey)
+    public static byte[] encryptDecrypt(String type, byte[] data, Key secretKey, Log log)
             throws ShortBufferException, NoSuchAlgorithmException,
             NoSuchPaddingException, InvalidKeyException,
@@ -255 +258 @@
 
         Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
-        System.out.println("Provider is-->" + cipher.getProvider().getInfo());
+        //System.out.println("Provider is-->" + cipher.getProvider().getInfo());
+        log.write("Provider is-->" + cipher.getProvider().getInfo(), 2);
         int j = 0;
         int k = 0;
@@ -279 +283 @@
 
         int cipherlength = cipher.getOutputSize(data.length);
-        System.out.println("data size-->" + data.length);
-        System.out.println("cipher size-->" + cipherlength);
+        //System.out.println("data size-->" + data.length);
+        log.write("data size-->" + data.length, 2);
+        //System.out.println("cipher size-->" + cipherlength);
+        log.write("cipher size-->" + cipherlength, 2);
         cryptedCipherText = new byte[cipherlength];
 
@@ -291 +297 @@
         {
             System.arraycopy(data, i, bufferedEncryption, 0, j);
-            System.out.println("sizeof bufferedencryption-->"
-                    + bufferedEncryption.length);
+            //System.out.println("sizeof bufferedencryption-->"
+                //    + bufferedEncryption.length);
+            log.write("sizeof bufferedencryption-->"
+                            + bufferedEncryption.length, 2);
             cryptedCipherText = cipher.doFinal(bufferedEncryption);
             count += cryptedCipherText.length;
-            System.out.println("Length-->" + count);
+            //System.out.println("Length-->" + count);
+            log.write("Length-->" + count, 2);
             cryptedTextBuffer.write(cryptedCipherText);
-            System.out.println("i-->" + i);
+            //System.out.println("i-->" + i);
+            log.write("i-->" + i, 2);
 
             i += k;