add strict referer security level

jererc · jererc · commit 361f4fb3da01 · 2013-02-12T09:59:43.000+01:00
diff --git a/cloudkey-1.2.jar b/cloudkey-1.2.jar
diff --git a/src/net/dmcloud/cloudkey/Api.java b/src/net/dmcloud/cloudkey/Api.java
@@ -7,14 +7,15 @@
 
 public class Api
 {
-	public static int SECLEVEL_NONE      = 0;
-	public static int SECLEVEL_DELEGATE  = 1 << 0;
-	public static int SECLEVEL_ASNUM     = 1 << 1;
-	public static int SECLEVEL_IP        = 1 << 2;
+	public static int SECLEVEL_NONE = 0;
+	public static int SECLEVEL_DELEGATE = 1 << 0;
+	public static int SECLEVEL_ASNUM = 1 << 1;
+	public static int SECLEVEL_IP = 1 << 2;
 	public static int SECLEVEL_USERAGENT = 1 << 3;
-	public static int SECLEVEL_USEONCE   = 1 << 4;
-	public static int SECLEVEL_COUNTRY   = 1 << 5;
-	public static int SECLEVEL_REFERER   = 1 << 6;
+	public static int SECLEVEL_USEONCE = 1 << 4;
+	public static int SECLEVEL_COUNTRY = 1 << 5;
+	public static int SECLEVEL_REFERER = 1 << 6;
+	public static int SECLEVEL_REFERER_STRICT = 1 << 15;
 
 	public static String API_URL = "http://api.dmcloud.net";
 	public static String CDN_URL = "http://cdn.dmcloud.net";
diff --git a/src/net/dmcloud/cloudkey/Helpers.java b/src/net/dmcloud/cloudkey/Helpers.java
@@ -155,7 +155,7 @@ static public String sign_url(String url, String secret, int seclevel, String as
 				}
 				public_secparams.add("cc=" + implode(",", countries).toLowerCase());
 			}
-			if ((seclevel & CloudKey.SECLEVEL_REFERER) > 0)
+			if ((seclevel & CloudKey.SECLEVEL_REFERER) > 0 || (seclevel & CloudKey.SECLEVEL_REFERER_STRICT) > 0)
 			{
 				if (referers == null || referers.length == 0)
 				{
@@ -179,7 +179,7 @@ static public String sign_url(String url, String secret, int seclevel, String as
 			}
 		}
 		String public_secparams_encoded = "";
-		
+
 		if (public_secparams.size() > 0)
 		{
             try
@@ -245,7 +245,7 @@ public static String md5(String password)
         {
         	throw new Error("No MD5 support in this VM.");
         }
-        
+
         StringBuilder hashString = new StringBuilder();
         for (int i=0; i<hash.length; i++)
         {
@@ -258,7 +258,7 @@ public static String md5(String password)
         	else
         	{
         		hashString.append(hex.substring(hex.length() - 2));
-        	}	
+        	}
         }
         return hashString.toString();
     }
@@ -268,7 +268,7 @@ private static byte[] gzcompress(String inputString) throws Exception
         byte[] input = inputString.getBytes("UTF-8");
         Deflater compresser = new Deflater();
         compresser.setInput(input);
-        compresser.finish();        
+        compresser.finish();
         ByteArrayOutputStream bos = new ByteArrayOutputStream(input.length);
         byte[] buf = new byte[1024];
         while (!compresser.finished())
@@ -277,7 +277,7 @@ private static byte[] gzcompress(String inputString) throws Exception
         	bos.write(buf, 0, count);
         }
         bos.close();
-        
+
         return bos.toByteArray();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ static public String sign_url(String url, String secret, int seclevel, String as`
`155`	`155`	`}`
`156`	`156`	`public_secparams.add("cc=" + implode(",", countries).toLowerCase());`
`157`	`157`	`}`
`158`		`- if ((seclevel & CloudKey.SECLEVEL_REFERER) > 0)`
	`158`	`+ if ((seclevel & CloudKey.SECLEVEL_REFERER) > 0 \|\| (seclevel & CloudKey.SECLEVEL_REFERER_STRICT) > 0)`
`159`	`159`	`{`
`160`	`160`	`if (referers == null \|\| referers.length == 0)`
`161`	`161`	`{`
`@@ -179,7 +179,7 @@ static public String sign_url(String url, String secret, int seclevel, String as`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`String public_secparams_encoded = "";`
`182`		`-`
	`182`	`+`
`183`	`183`	`if (public_secparams.size() > 0)`
`184`	`184`	`{`
`185`	`185`	`try`
`@@ -245,7 +245,7 @@ public static String md5(String password)`
`245`	`245`	`{`
`246`	`246`	`throw new Error("No MD5 support in this VM.");`
`247`	`247`	`}`
`248`		`-`
	`248`	`+`
`249`	`249`	`StringBuilder hashString = new StringBuilder();`
`250`	`250`	`for (int i=0; i<hash.length; i++)`
`251`	`251`	`{`
`@@ -258,7 +258,7 @@ public static String md5(String password)`
`258`	`258`	`else`
`259`	`259`	`{`
`260`	`260`	`hashString.append(hex.substring(hex.length() - 2));`
`261`		`- }`
	`261`	`+ }`
`262`	`262`	`}`
`263`	`263`	`return hashString.toString();`
`264`	`264`	`}`
`@@ -268,7 +268,7 @@ private static byte[] gzcompress(String inputString) throws Exception`
`268`	`268`	`byte[] input = inputString.getBytes("UTF-8");`
`269`	`269`	`Deflater compresser = new Deflater();`
`270`	`270`	`compresser.setInput(input);`
`271`		`- compresser.finish();`
	`271`	`+ compresser.finish();`
`272`	`272`	`ByteArrayOutputStream bos = new ByteArrayOutputStream(input.length);`
`273`	`273`	`byte[] buf = new byte[1024];`
`274`	`274`	`while (!compresser.finished())`
`@@ -277,7 +277,7 @@ private static byte[] gzcompress(String inputString) throws Exception`
`277`	`277`	`bos.write(buf, 0, count);`
`278`	`278`	`}`
`279`	`279`	`bos.close();`
`280`		`-`
	`280`	`+`
`281`	`281`	`return bos.toByteArray();`
`282`	`282`	`}`
`283`	`283`	`}`