From 48a4edadb2466d3ceea6fde43ee5aeffd55e17e8 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Sun, 6 Feb 2022 02:23:22 -0500
Subject: [PATCH 01/10] Bump bluemonday to 1.0.17 and implement support for
 RequireSandboxOnIFrame

---
 bluemonday.go                     | 19 ++++++++++++++++
 build_ffi.py                      |  2 ++
 go.mod                            |  5 ++++-
 go.sum                            | 10 +++++++--
 pybluemonday/__init__.py          | 29 ++++++++++++++++++++++++-
 tests/bluemonday/test_sanitize.py | 36 ++++++++++++++++++++++++++++++-
 6 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/bluemonday.go b/bluemonday.go
index 628802d..51d8b56 100644
--- a/bluemonday.go
+++ b/bluemonday.go
@@ -156,6 +156,25 @@ func CallPolicyFunctionWithBool(policyId C.ulong, method *C.char, argument C.uin
 	meth.Call(args)
 }
 
+//export CallPolicyFunctionWithInt
+func CallPolicyFunctionWithInt(policyId C.ulong, method *C.char, argtype *C.char, argument C.uint) {
+	goPolicyId := uint32(policyId)
+	goMethod := C.GoString(method)
+	goArgType := C.GoString(argtype)
+	goArgument := int(argument)
+	policy := POLICIES[goPolicyId]
+
+	switch goArgType {
+	case "SandboxValue":
+		sv := bluemonday.SandboxValue(goArgument)
+		args := []reflect.Value{reflect.ValueOf(sv)}
+		meth := reflect.ValueOf(policy).MethodByName(goMethod)
+		meth.Call(args)
+	default:
+		panic("Unknown argument type function")
+	}
+}
+
 //export SanitizeWithPolicy
 func SanitizeWithPolicy(policyId C.ulong, document *C.char) *C.char {
 	goPolicyId := uint32(policyId)
diff --git a/build_ffi.py b/build_ffi.py
index 90b4c37..01a1e93 100644
--- a/build_ffi.py
+++ b/build_ffi.py
@@ -29,6 +29,8 @@
 
 extern void CallPolicyFunctionWithBool(long unsigned int p0, char* p1, unsigned int p2);
 
+extern void CallPolicyFunctionWithInt(long unsigned int policyId, char* method, char* argtype, unsigned int argument);
+
 extern char* SanitizeWithPolicy(long unsigned int p0, char* p1);
 
 extern void FreeCString(char* p0);
diff --git a/go.mod b/go.mod
index 680ee02..c65ed22 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,7 @@ module pybluemonday
 
 go 1.14
 
-require github.com/microcosm-cc/bluemonday v1.0.16
+require (
+	github.com/microcosm-cc/bluemonday v1.0.17
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+)
diff --git a/go.sum b/go.sum
index 06cbf36..97e5d76 100644
--- a/go.sum
+++ b/go.sum
@@ -2,12 +2,18 @@ github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuP
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
-github.com/microcosm-cc/bluemonday v1.0.16 h1:kHmAq2t7WPWLjiGvzKa5o3HzSfahUKiOq7fAPUiMNIc=
-github.com/microcosm-cc/bluemonday v1.0.16/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
+github.com/microcosm-cc/bluemonday v1.0.17 h1:Z1a//hgsQ4yjC+8zEkV8IWySkXnsxmdSY642CTFQb5Y=
+github.com/microcosm-cc/bluemonday v1.0.17/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/pybluemonday/__init__.py b/pybluemonday/__init__.py
index 2d47c2e..34d2359 100644
--- a/pybluemonday/__init__.py
+++ b/pybluemonday/__init__.py
@@ -1,9 +1,28 @@
+from enum import IntEnum, unique
 from typing import List
 from unicodedata import normalize
 
 from pybluemonday.bluemonday import ffi, lib
 
-__version__ = "0.0.8"
+__version__ = "0.0.9"
+
+
+@unique
+class SandboxValue(IntEnum):
+    SandboxAllowDownloads = 0
+    SandboxAllowDownloadsWithoutUserActivation = 1
+    SandboxAllowForms = 2
+    SandboxAllowModals = 3
+    SandboxAllowOrientationLock = 4
+    SandboxAllowPointerLock = 5
+    SandboxAllowPopups = 6
+    SandboxAllowPopupsToEscapeSandbox = 7
+    SandboxAllowPresentation = 8
+    SandboxAllowSameOrigin = 9
+    SandboxAllowScripts = 10
+    SandboxAllowStorageAccessByUserActivation = 11
+    SandboxAllowTopNavigation = 12
+    SandboxAllowTopNavigationByUserActivation = 13
 
 
 class AttrPolicyBuilder:
@@ -80,6 +99,14 @@ def method(*args):
                 elif isinstance(args[0], bool):
                     bool_arg = int(args[0])
                     lib.CallPolicyFunctionWithBool(self._id, method_name, bool_arg)
+                elif isinstance(args[0], IntEnum):
+                    enum_arg = args[0]
+                    # Get name of the enum to infer what underlying Go type we need
+                    enum_name = enum_arg.__class__.__name__.encode()
+                    int_arg = int(enum_arg)
+                    lib.CallPolicyFunctionWithInt(
+                        self._id, method_name, enum_name, int_arg
+                    )
             else:
                 lib.CallPolicyFunction(self._id, method_name)
 
diff --git a/tests/bluemonday/test_sanitize.py b/tests/bluemonday/test_sanitize.py
index 705eefc..b1325f3 100644
--- a/tests/bluemonday/test_sanitize.py
+++ b/tests/bluemonday/test_sanitize.py
@@ -1,4 +1,4 @@
-from pybluemonday import UGCPolicy, StrictPolicy, NewPolicy
+from pybluemonday import UGCPolicy, StrictPolicy, NewPolicy, SandboxValue
 from collections import namedtuple
 from multiprocessing.pool import ThreadPool, Pool
 
@@ -149,3 +149,37 @@ def test_selectStyleBug():
         p.sanitize("<select><option><style><script>alert(1)</script>")
         == "<select><option><style><script>alert(1)</script>"
     )
+
+
+def test_IFrameSandbox():
+    # Test updates from bluemonday v1.0.17
+    p = NewPolicy()
+    p.AllowAttrs("sandbox").OnElements("iframe")
+    input = """<iframe src="http://example.com" sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
+    out = """<iframe sandbox="allow-downloads"></iframe>"""
+    assert p.sanitize(input) == out
+
+
+def test_IFrameSandboxAttribute():
+    # Test updates from bluemonday v1.0.17
+    p = NewPolicy()
+    p.AllowIFrames()
+    input = """<iframe src="http://example.com" sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
+    out = """<iframe sandbox=""></iframe>"""
+    assert p.sanitize(input) == out
+
+    p = NewPolicy()
+    p.AllowIFrames()
+    input = """<iframe src="http://example.com" sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
+    out = """<iframe sandbox=""></iframe>"""
+    assert p.sanitize(input) == out
+
+    p.RequireSandboxOnIFrame(SandboxValue.SandboxAllowDownloads)
+    input = """<iframe src="http://example.com" sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
+    out = """<iframe sandbox="allow-downloads"></iframe>"""
+    assert p.sanitize(input) == out
+
+    p.RequireSandboxOnIFrame(SandboxValue.SandboxAllowForms)
+    input = """<iframe src="http://example.com" sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
+    out = """<iframe sandbox="allow-forms allow-downloads"></iframe>"""
+    assert p.sanitize(input) == out

From b593d535da42d2dff03632742bcfa2c1e5387950 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 10:41:59 -0500
Subject: [PATCH 02/10] Bump bluemonday version

---
 go.mod                            | 2 +-
 go.sum                            | 4 ++--
 tests/bluemonday/test_sanitize.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index c65ed22..aafdb2a 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,6 @@ module pybluemonday
 go 1.14
 
 require (
-	github.com/microcosm-cc/bluemonday v1.0.17
+	github.com/microcosm-cc/bluemonday v1.0.18
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
 )
diff --git a/go.sum b/go.sum
index 97e5d76..5e9a3dc 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,8 @@ github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuP
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
-github.com/microcosm-cc/bluemonday v1.0.17 h1:Z1a//hgsQ4yjC+8zEkV8IWySkXnsxmdSY642CTFQb5Y=
-github.com/microcosm-cc/bluemonday v1.0.17/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
+github.com/microcosm-cc/bluemonday v1.0.18 h1:6HcxvXDAi3ARt3slx6nTesbvorIc3QeTzBNRvWktHBo=
+github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
diff --git a/tests/bluemonday/test_sanitize.py b/tests/bluemonday/test_sanitize.py
index b1325f3..a8889c2 100644
--- a/tests/bluemonday/test_sanitize.py
+++ b/tests/bluemonday/test_sanitize.py
@@ -181,5 +181,5 @@ def test_IFrameSandboxAttribute():
 
     p.RequireSandboxOnIFrame(SandboxValue.SandboxAllowForms)
     input = """<iframe src="http://example.com" sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
-    out = """<iframe sandbox="allow-forms allow-downloads"></iframe>"""
+    out = """<iframe sandbox="allow-forms"></iframe>"""
     assert p.sanitize(input) == out

From 772516545d9ba6537e0115d45182e66f13fcc97a Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 10:44:40 -0500
Subject: [PATCH 03/10] Update CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3458f05..b45be31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.0.9 / 2022-02-11
+
+- Bump bluemonday to 1.0.18
+- Implement rough support for `RequireSandboxOnIFrame` by having an approach to call functions that take typed arguments
+  - This doesn't work entirely because currently only a single call to `RequireSandboxOnIFrame` will work but it will suffice until this behavior is actually needed.
+
 # 0.0.8 / 2021-10-18
 
 - Bump bluemonday version to 1.0.16

From 4189e75694a37878e06bc3afd29348894d2d129d Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 10:49:44 -0500
Subject: [PATCH 04/10] Fix test and bump cibuildwheel version

---
 development.txt                   | 2 +-
 tests/bluemonday/test_sanitize.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/development.txt b/development.txt
index 4f840c3..d55b00d 100644
--- a/development.txt
+++ b/development.txt
@@ -6,4 +6,4 @@ isort==5.6.4
 twine==3.1.1
 pytest==6.1.2
 psutil==5.7.3
-cibuildwheel==1.10.0
+cibuildwheel==2.3.1
diff --git a/tests/bluemonday/test_sanitize.py b/tests/bluemonday/test_sanitize.py
index a8889c2..5d22d2f 100644
--- a/tests/bluemonday/test_sanitize.py
+++ b/tests/bluemonday/test_sanitize.py
@@ -156,7 +156,7 @@ def test_IFrameSandbox():
     p = NewPolicy()
     p.AllowAttrs("sandbox").OnElements("iframe")
     input = """<iframe src="http://example.com" sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
-    out = """<iframe sandbox="allow-downloads"></iframe>"""
+    out = """<iframe sandbox="allow-forms allow-downloads allow-downloads"></iframe>"""
     assert p.sanitize(input) == out
 
 

From 78ba93dc4b1bb3692ab62d27294bc2f3d40ba51a Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 10:51:11 -0500
Subject: [PATCH 05/10] Add Python 3.10 to the test matrix

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 48e5153..75ff5d2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     name: Python ${{ matrix.python-version }}
     steps:

From 9092140beb7a6228dc692d300650cb948662bb71 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 10:58:42 -0500
Subject: [PATCH 06/10] Bump wheel to 0.37.1 to support 3.10

---
 development.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/development.txt b/development.txt
index d55b00d..2df4ca0 100644
--- a/development.txt
+++ b/development.txt
@@ -1,5 +1,5 @@
 setuptools-golang==2.3.0
-wheel==0.36.1
+wheel==0.37.1
 cffi==1.14.5
 black==20.8b1
 isort==5.6.4

From ac14740e8f377b10cbd888c2a90870a53d7c1935 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 11:02:48 -0500
Subject: [PATCH 07/10] Bump pytest version to 6.2.5

---
 development.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/development.txt b/development.txt
index 2df4ca0..d983667 100644
--- a/development.txt
+++ b/development.txt
@@ -4,6 +4,6 @@ cffi==1.14.5
 black==20.8b1
 isort==5.6.4
 twine==3.1.1
-pytest==6.1.2
+pytest==6.2.5
 psutil==5.7.3
 cibuildwheel==2.3.1

From c01ce17f16bcbeb07e694f70d99bc68845dd6518 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 11:14:26 -0500
Subject: [PATCH 08/10] Skip musllinux

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d88e676..29928e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
         if: runner.os == 'Linux'
         env:
           CIBW_BUILD: cp3?-*
-          CIBW_SKIP: "cp35-* *-win32 *-manylinux_i686 *-manylinux_aarch64 *-manylinux_ppc64le *-manylinux_s390x"
+          CIBW_SKIP: "cp35-* *-win32 *-musllinux_* *-manylinux_i686 *-manylinux_aarch64 *-manylinux_ppc64le *-manylinux_s390x"
           CIBW_BUILD_VERBOSITY: 1
         run: |
           python setup.py sdist

From 1d4065128c36e1043c26e4291da36fe13122d7d8 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 11:26:57 -0500
Subject: [PATCH 09/10] Skip building musllinux wheels

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29928e8..fdc4b84 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,6 +54,7 @@ jobs:
         env:
           CIBW_ARCHS_LINUX: i686
           CIBW_BUILD_VERBOSITY: 1
+          CIBW_SKIP: "*-musllinux_*"
         run: |
           python3 -m cibuildwheel --output-dir wheelhouse
 
@@ -62,6 +63,7 @@ jobs:
         env:
           CIBW_ARCHS_LINUX: aarch64
           CIBW_BUILD_VERBOSITY: 1
+          CIBW_SKIP: "*-musllinux_*"
         run: |
           python3 -m cibuildwheel --output-dir wheelhouse
 

From ac001faf1cc69a0db7946a5032e114b832530211 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Fri, 11 Feb 2022 12:22:50 -0500
Subject: [PATCH 10/10] Update changes to CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b45be31..9706cd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - Bump bluemonday to 1.0.18
 - Implement rough support for `RequireSandboxOnIFrame` by having an approach to call functions that take typed arguments
   - This doesn't work entirely because currently only a single call to `RequireSandboxOnIFrame` will work but it will suffice until this behavior is actually needed.
+- Build wheels for Python 3.10 (Closes #29)
 
 # 0.0.8 / 2021-10-18