Friendpaste

--- Revision 346531646132
+++ Revision 666230303566
@@ -53,19 +53,22 @@
 
 work flow : 
 
-is origins list empty in ini
+is the 'origins' section empty in ini ?
 yes -> is admin party set ? 
   yes -> return "*" , credentials false (with a good caching policy)
   no -> stop
-no -> 
-  is host in .ini ? 
-  yes ->
-    is origin in host cors list ?
+no ->
+  run the following steps [apply cors steps]
+    is Host in 'origins' ?
     yes ->
-      set the cors headers based on .ini
-      then are we on a db resource ?
-        yes ->
-          apply the intersection of .ini with db resource
-    no -> stop 
-  no ->
-    <bikeshed defaults>
+      is Origin in 'origins[Host]' ?
+      yes ->
+        set the cors headers based on 'origins[Host]'
+        are we on a db resource ?
+          yes ->
+            repeat 'apply cors steps' with the db _security object instead of the .ini
+          no ->
+            succeed
+      no -> fail 
+    no ->
+      <bikeshed defaults>
a	b
52	52
53	53		work flow :
54	54
...
55		-	is ~~origins list empty in ini~~
	55	+	is the 'origins' section empty in ini ?
...
56	56		yes -> is admin party set ?
57	57		yes -> return "*" , credentials false (with a good caching policy)
58	58		no -> stop
...
59		-	no ->
59		-	is host in .ini ?
59		-	yes ->
59		-	is origin in host cors list ?
	59	+	no ->
	59	+	run the following steps [apply cors steps]
	59	+	is Host in 'origins' ?
...
63	63		yes ->
...
64		-	set the cors headers based on .ini
64		-	then are we on a db resource ?
64		-	yes ->
64		-	apply the intersection of .ini with db resource
64		-	no -> stop
64		-	no ->
64		-	<bikeshed defaults>
	64	+	is Origin in 'origins[Host]' ?
	64	+	yes ->
	64	+	set the cors headers based on 'origins[Host]'
	64	+	are we on a db resource ?
	64	+	yes ->
	64	+	repeat 'apply cors steps' with the db _security object instead of the .ini
	64	+	no ->
	64	+	succeed
	64	+	no -> fail
	64	+	no ->
	64	+	<bikeshed defaults>
...