.

qyb · Mar 6, 2012 · 05ca4a7 · 05ca4a7
1 parent 4c321be
commit 05ca4a7
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 271 deletions.
diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/APIResponseHeader.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/APIResponseHeader.java
diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/CommonRequestHeader.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/CommonRequestHeader.java
diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/CommonResponseHeader.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/CommonResponseHeader.java
diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/Handler.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/Handler.java
@@ -24,6 +24,7 @@
 import org.restlet.resource.Put;
 import org.restlet.resource.ServerResource;
 
+import com.scss.Headers;
 import com.scss.Operation;
 import com.scss.OperationResult;
 import com.scss.core.security.Authorization;
@@ -200,13 +201,21 @@ protected Map<String, String> getRequestHeaders(){
 	 * TODO: convert to class or module
 	 */
 	protected Boolean Authorize(APIRequest req) {
-//		logger.debug("Start fake authorization.");
-//		ScssUser suser = ScssUserDaoImpl.getInstance().getUserByAccessId("FAKE_ACCESS_ID_00002");
-//		logger.debug(String.format("Authorized user : %s", suser));
-//		req.setUser(new User(suser));
-//		return true;
-		IAuth auth = Authorization.createInstace(req);
-		return auth.authorize();
+		logger.debug("Start fake authorization.");
+		String id = "FAKE_ACCESS_ID_00002";
+		String req_auth = req.getHeaders().get(Headers.AUTHORIZATION);
+		if (null != req_auth) {
+			String[] authes = req_auth.split("\\s|:");
+			if (3 == authes.length){
+				id = authes[1];
+			}
+		}
+		ScssUser suser = ScssUserDaoImpl.getInstance().getUserByAccessId(id);
+		logger.debug(String.format("Authorized user : %s", suser));
+		req.setUser(new User(suser));
+		return true;
+//		IAuth auth = Authorization.createInstace(req);
+//		return auth.authorize();
 	}
 
 	/*

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/bucket/GET_BUCKET.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/bucket/GET_BUCKET.java
@@ -100,8 +100,8 @@ private String getResponseText(APIRequest req, List<ScssObject> bucket_objects)
 		sb.append("  <MaxKeysIsNotImplemented />"); // TODO: Not implemented
 		sb.append("  <IsTruncated>false</IsTruncated>"); // TODO: Not implemented
 
-		sb.append("  <Contents>");
 		for(ScssObject obj: bucket_objects){
+			sb.append("  <Contents>");
 		    sb.append("    <Key>").append(obj.getKey()).append("</Key>");
 		    sb.append("    <LastModified>").append(CommonUtilities.formatResponseTextDate(obj.getModifyTime())).append("</LastModified>");
 		    sb.append("    <ETag>").append(obj.getEtag()).append("</ETag>"); 
@@ -110,9 +110,10 @@ private String getResponseText(APIRequest req, List<ScssObject> bucket_objects)
 			sb.append("    <Owner>");
 			sb.append("      <ID>").append(req.getUser().getAccessId()).append("</ID>");
 			sb.append("      <DisplayName>").append(req.getUser().getSohuId()).append("</DisplayName>");
-			sb.append("    </Owner>");		    
+			sb.append("    </Owner>");
+			sb.append("  </Contents>");
 		}
-		sb.append("  </Contents>");
+
 		sb.append("</ListBucketResult>"); 
 		return sb.toString();
 	}

diff --git a/src/StorageWorkspace/StorageAPI/src/com/scss/core/security/QueryStringSigner.java b/src/StorageWorkspace/StorageAPI/src/com/scss/core/security/QueryStringSigner.java
@@ -20,6 +20,8 @@ public static void main(String[] args) {
 		String sig = signer.sign(str_to_sign);
 		System.err.println(String.format("http://boto-test.s3.amazonaws.com/obj3?"
 				+ "AWSAccessKeyId=%s&Expires=%d&Signature=%s", access_id, expires, sig)); 
+		System.err.println(String.format("http://boto-test.s3.itc.cn/obj3?"
+				+ "AWSAccessKeyId=%s&Expires=%d&Signature=%s", access_id, expires, sig)); 
 
 	}
 

diff --git a/src/StorageWorkspace/StorageAPIBotoTest/src/scss/helper.py b/src/StorageWorkspace/StorageAPIBotoTest/src/scss/helper.py
@@ -8,8 +8,12 @@
 logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 #boto.s3.connection.S3Connection.DefaultHost = "localhost"
 
-AWS_SECRET_ACCESS_KEY = 'rfUdPSAC2hXhHMGG0wXiHcxeuEpqybEGxn8xPYMy'
-AWS_ACCESS_KEY_ID = 'AKIAIXEPRIJSQA4A2KOA'
+#AWS_SECRET_ACCESS_KEY = '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'
+#AWS_ACCESS_KEY_ID = 'AKIAIXEPRIJSQA4A2KOA'
+
+AWS_SECRET_ACCESS_KEY = 'FACKE_ACCESS_SECRET_KEY_!!!!!!_###_00002'
+AWS_ACCESS_KEY_ID = 'FAKE_ACCESS_ID_00002'
+
 
 def build_connect_s3():
     s3 = boto.connect_s3(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, is_secure=False)

diff --git a/src/StorageWorkspace/StorageAPITest/bin/com/bfsapi/test/AwsCredentials.properties b/src/StorageWorkspace/StorageAPITest/bin/com/bfsapi/test/AwsCredentials.properties
@@ -1,4 +1,7 @@
 # Fill in your AWS Access Key ID and Secret Access Key
 # http://aws.amazon.com/security-credentials
-accessKey =AKIAIXEPRIJSQA4A2KOA
-secretKey =rfUdPSAC2hXhHMGG0wXiHcxeuEpqybEGxn8xPYMy
+#accessKey =AKIAIXEPRIJSQA4A2KOA
+#secretKey =rfUdPSAC2hXhHMGG0wXiHcxeuEpqybEGxn8xPYMy
+
+accessKey =FAKE_ACCESS_ID_00002
+secretKey =FACKE_ACCESS_SECRET_KEY_!!!!!!_###_00002
diff --git a/src/StorageWorkspace/StorageAPITest/src/com/bfsapi/test/AwsCredentials.properties b/src/StorageWorkspace/StorageAPITest/src/com/bfsapi/test/AwsCredentials.properties
@@ -1,4 +1,7 @@
 # Fill in your AWS Access Key ID and Secret Access Key
 # http://aws.amazon.com/security-credentials
-accessKey =AKIAIXEPRIJSQA4A2KOA
-secretKey =rfUdPSAC2hXhHMGG0wXiHcxeuEpqybEGxn8xPYMy
+#accessKey =AKIAIXEPRIJSQA4A2KOA
+#secretKey =rfUdPSAC2hXhHMGG0wXiHcxeuEpqybEGxn8xPYMy
+
+accessKey =FAKE_ACCESS_ID_00002
+secretKey =FACKE_ACCESS_SECRET_KEY_!!!!!!_###_00002
diff --git a/src/StorageWorkspace/StorageAPITest/src/com/bfsapi/test/S3Sample.java b/src/StorageWorkspace/StorageAPITest/src/com/bfsapi/test/S3Sample.java
@@ -85,10 +85,14 @@ public static void main(String[] args) throws IOException {
              * keep your data closer to your applications or users.
              */
             System.out.println("Creating bucket " + bucketName + "\n");
+            try {
             Bucket b = s3.createBucket(bucketName);
             if (b != null) {
             	System.out.printf("bucket <%s> created or existed\n", b.getName());
             }
+            } catch (Exception e) {
+            	e.printStackTrace();
+            }
 
             /*
              * List the buckets in your account