postObject policy supports In and Not-In.

Author: huiguangjun

src/main/java/com/aliyun/oss/model/MatchMode.java

@@ -25,5 +25,7 @@
 public enum MatchMode {
     Unknown, Exact, // Exact match
     StartWith, // Starts With
-    Range // The range of file size
+    Range, // The range of file size
+    In,
+    NotIn
 }

src/main/java/com/aliyun/oss/model/PolicyConditions.java

@@ -19,6 +19,7 @@
 
 package com.aliyun.oss.model;
 
+import com.aliyun.oss.common.utils.StringUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -41,6 +42,7 @@ enum TupleType {
     private TupleType tupleType;
     private long minimum;
     private long maximum;
+    private String[] contain;
 
     public ConditionItem(String name, String value) {
         this.matchMode = MatchMode.Exact;
@@ -64,6 +66,13 @@ public ConditionItem(MatchMode matchMode, String name, String value) {
         this.tupleType = TupleType.Three;
     }
 
+    public ConditionItem(MatchMode matchMode, String name, String[] contain) {
+        this.matchMode = matchMode;
+        this.name = name;
+        this.contain = contain;
+        this.tupleType = TupleType.Three;
+    }
+
     public String jsonize() {
         String jsonizedCond = null;
         switch (tupleType) {
@@ -81,6 +90,12 @@ public String jsonize() {
             case Range:
                 jsonizedCond = String.format("[\"content-length-range\",%d,%d],", minimum, maximum);
                 break;
+            case In:
+                jsonizedCond = String.format("[\"in\",\"$%s\",[\"%s\"]],", name,  StringUtils.join("\",\"",contain));
+                break;
+            case NotIn:
+                jsonizedCond = String.format("[\"not-in\",\"$%s\",[\"%s\"]],", name, StringUtils.join("\",\"",contain));
+                break;
             default:
                 throw new IllegalArgumentException(String.format("Unsupported match mode %s", matchMode.toString()));
             }
@@ -162,6 +177,8 @@ public class PolicyConditions {
         List<MatchMode> ordinaryMatchModes = new ArrayList<MatchMode>();
         ordinaryMatchModes.add(MatchMode.Exact);
         ordinaryMatchModes.add(MatchMode.StartWith);
+        ordinaryMatchModes.add(MatchMode.In);
+        ordinaryMatchModes.add(MatchMode.NotIn);
         List<MatchMode> specialMatchModes = new ArrayList<MatchMode>();
         specialMatchModes.add(MatchMode.Range);
 
@@ -224,6 +241,21 @@ public void addConditionItem(String name, long min, long max) {
         _conds.add(new ConditionItem(name, min, max));
     }
 
+    /**
+     * Adds a condition item with specified {@link MatchMode} value.
+     *
+     * @param matchMode
+     *            Conditions match mode.
+     * @param name
+     *            Condition name.
+     * @param contain
+     *            Condition contain.
+     */
+    public void addConditionItem(MatchMode matchMode, String name, String[] contain) {
+        checkMatchModes(matchMode, name);
+        _conds.add(new ConditionItem(matchMode, name.toLowerCase(), contain));
+    }
+
     private void checkMatchModes(MatchMode matchMode, String condName) {
         if (_supportedMatchRules.containsKey(condName)) {
             List<MatchMode> mms = _supportedMatchRules.get(condName);

src/test/java/com/aliyun/oss/integrationtests/PostPolicyTest.java

@@ -107,4 +107,50 @@ public void testjsonizeError() {
         }
     }
 
+
+    @Test
+    public void testGenPostPolicyWithInAndNotIn() {
+        final String bucketName = "gen-post-policy";
+        OSSClient client = null;
+
+        try {
+            client = new OSSClient(TestConfig.OSS_TEST_ENDPOINT, "AAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB");
+            Date expiration = DateUtil.parseIso8601Date("2020-03-19T03:44:06.476Z");
+
+            PolicyConditions policyConds = new PolicyConditions();
+            policyConds.addConditionItem("bucket", bucketName);
+            policyConds.addConditionItem(MatchMode.Exact, PolicyConditions.COND_KEY, "user/eric/\\${filename}");
+            policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, "user/eric");
+            policyConds.addConditionItem(MatchMode.StartWith, "x-oss-meta-tag", "dummy_etag");
+            policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 1, 1024);
+            policyConds.addConditionItem(MatchMode.In, PolicyConditions.COND_CONTENT_TYPE, new String[]{"image/jpg","image/png"});
+            policyConds.addConditionItem(MatchMode.NotIn, PolicyConditions.COND_CACHE_CONTROL, new String[]{"no-cache"});
+
+            String actualPostPolicy = client.generatePostPolicy(expiration, policyConds);
+            String expectedPostPolicy = String.format("{\"expiration\":\"2020-03-19T03:44:06.476Z\",\"conditions\":[{\"bucket\":\"%s\"},"
+                    + "[\"eq\",\"$key\",\"user/eric/\\${filename}\"],[\"starts-with\",\"$key\",\"user/eric\"],[\"starts-with\",\"$x-oss-meta-tag\","
+                    + "\"dummy_etag\"],[\"content-length-range\",1,1024],[\"in\",\"$content-type\",[\"image/jpg\",\"image/png\"]],[\"not-in\",\"$cache-control\",[\"no-cache\"]]]}", bucketName);
+            Assert.assertEquals(expectedPostPolicy, actualPostPolicy);
+
+            byte[] binaryData = actualPostPolicy.getBytes("utf-8");
+            String actualEncodedPolicy = BinaryUtil.toBase64String(binaryData);
+            String expectedEncodedPolicy = "eyJleHBpcmF0aW9uIjoiMjAyMC0wMy0xOVQwMzo0NDowNi40NzZaIiwiY29uZGl0aW9ucyI6W" +
+                    "3siYnVja2V0IjoiZ2VuLXBvc3QtcG9saWN5In0sWyJlcSIsIiRrZXkiLCJ1c2VyL2VyaWMvXCR7ZmlsZW5hbWV9Il0sWyJzd" +
+                    "GFydHMtd2l0aCIsIiRrZXkiLCJ1c2VyL2VyaWMiXSxbInN0YXJ0cy13aXRoIiwiJHgtb3NzLW1ldGEtdGFnIiwiZHVtbXlfZ" +
+                    "XRhZyJdLFsiY29udGVudC1sZW5ndGgtcmFuZ2UiLDEsMTAyNF0sWyJpbiIsIiRjb250ZW50LXR5cGUiLFsiaW1hZ2UvanBnI" +
+                    "iwiaW1hZ2UvcG5nIl1dLFsibm90LWluIiwiJGNhY2hlLWNvbnRyb2wiLFsibm8tY2FjaGUiXV1dfQ==";
+            Assert.assertEquals(expectedEncodedPolicy, actualEncodedPolicy);
+
+            String actualPostSignature = client.calculatePostSignature(actualPostPolicy);
+
+            Assert.assertTrue(actualPostSignature.equals("xyOp/TIhzYWH8e+kjJ4bkY60BH8="));
+        } catch (Exception e) {
+            Assert.fail(e.getMessage());
+        } finally {
+            if (client != null) {
+                client.shutdown();
+            }
+        }
+    }
+
 }