fix sign_url ; rebuild cloudkey.jar ; add build.xml (ant)

nyvath · nyvath · commit 2e9078688fe9 · 2011-12-09T16:53:01.000+01:00
diff --git a/build.xml b/build.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<project name="FatJar cloudkey.jar (experimental)" default="main" basedir=".">
+    <!-- this file was created by Fat-Jar Eclipse Plug-in -->
+    <!-- the ANT-Export is in a very early stage, so this -->
+    <!-- is only experimental, ANT 1.6 or above is        -->
+    <!-- required, feedback is always welcome:            -->
+    <!--       http://sourceforge.net/projects/fjep       -->
+    <!-- uncomment the following lines if using ANT outside Eclipse -->
+    <!--
+        <property name="fjepPath" value="reference:file:plugins/net.sf.fjep.fatjar_0.0.31/fatjar.jar"/>
+        <taskdef name="fatjar.build" classname="net.sf.fjep.anttask.FJBuildTask" classpath="${fjepPath}"/>
+        <typedef name="fatjar.manifest" classname="net.sf.fjep.anttask.FJManifestType" classpath="${fjepPath}"/>
+        <typedef name="fatjar.exclude" classname="net.sf.fjep.anttask.FJExcludeType" classpath="${fjepPath}"/>
+        <typedef name="fatjar.jarsource" classname="net.sf.fjep.anttask.FJJarSourceType" classpath="${fjepPath}"/>
+        <typedef name="fatjar.filesource" classname="net.sf.fjep.anttask.FJFileSourceType" classpath="${fjepPath}"/>
+    -->
+    <!-- uncomment the above lines to use ANT outside of Eclipse -->
+    <target name="main">
+        <fatjar.build output="cloudkey.jar">
+            <fatjar.manifest/>
+            <fatjar.filesource path="/Users/nyvath/Documents/cloudkey/cloudkey-java/bin" relpath="">
+                <fatjar.exclude relpath="third-party/"/>
+                <fatjar.exclude relpath="Config.jsp"/>
+                <fatjar.exclude relpath="MediaCreate.jsp"/>
+                <fatjar.exclude relpath="MediaList.jsp"/>
+                <fatjar.exclude relpath="Upload.jsp"/>
+            </fatjar.filesource>
+            <fatjar.jarsource file="/Users/nyvath/Documents/cloudkey/cloudkey-java/src/third-party/jackson-core-asl-1.8.1.jar" relpath=""/>
+            <fatjar.jarsource file="/Users/nyvath/Documents/cloudkey/cloudkey-java/src/third-party/jackson-mapper-asl-1.8.1.jar" relpath=""/>
+            <fatjar.jarsource file="/Users/nyvath/Documents/cloudkey/cloudkey-java/src/third-party/commons-codec-1.4.jar" relpath=""/>
+            <fatjar.jarsource file="/Users/nyvath/Documents/cloudkey/cloudkey-java/src/third-party/commons-logging-1.1.1.jar" relpath=""/>
+            <fatjar.jarsource file="/Users/nyvath/Documents/cloudkey/cloudkey-java/src/third-party/commons-httpclient-3.1.jar" relpath=""/>
+        </fatjar.build>
+    </target>
+</project>
diff --git a/cloudkey.jar b/cloudkey.jar
diff --git a/src/net/dmcloud/cloudkey/Helpers.java b/src/net/dmcloud/cloudkey/Helpers.java
@@ -107,7 +107,7 @@ static public String sign_url(String url, String secret) throws DCException
 
 	static public String sign_url(String url, String secret, int seclevel, String asnum, String ip, String useragent, String[] countries, String[] referers, int expires) throws DCException
 	{
-		expires = (expires == 0) ? (int)(new Date().getTime() + 7200) : expires;
+		expires = (expires == 0) ? (int)((new Date().getTime() / 1000) + 7200) : expires;
 
 		// Compute digest
 		String[] tokens = url.split("\\?");

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ static public String sign_url(String url, String secret) throws DCException`
`107`	`107`
`108`	`108`	`static public String sign_url(String url, String secret, int seclevel, String asnum, String ip, String useragent, String[] countries, String[] referers, int expires) throws DCException`
`109`	`109`	`{`
`110`		`- expires = (expires == 0) ? (int)(new Date().getTime() + 7200) : expires;`
	`110`	`+ expires = (expires == 0) ? (int)((new Date().getTime() / 1000) + 7200) : expires;`
`111`	`111`
`112`	`112`	`// Compute digest`
`113`	`113`	`String[] tokens = url.split("\\?");`