From 2e2209588c8e5ff0f09ff4a7518bf86b0c55fd7e Mon Sep 17 00:00:00 2001
From: DavidKorczynski <david@adalogics.com>
Date: Mon, 20 Mar 2023 15:25:09 +0000
Subject: [PATCH] six: initial integration (#9961)

Signed-off-by: David Korczynski <david@adalogics.com>
---
 projects/six/Dockerfile   | 22 +++++++++++++
 projects/six/build.sh     | 21 ++++++++++++
 projects/six/fuzz_six.py  | 69 +++++++++++++++++++++++++++++++++++++++
 projects/six/project.yaml | 10 ++++++
 4 files changed, 122 insertions(+)
 create mode 100644 projects/six/Dockerfile
 create mode 100644 projects/six/build.sh
 create mode 100644 projects/six/fuzz_six.py
 create mode 100644 projects/six/project.yaml

diff --git a/projects/six/Dockerfile b/projects/six/Dockerfile
new file mode 100644
index 000000000..957be95e5
--- /dev/null
+++ b/projects/six/Dockerfile
@@ -0,0 +1,22 @@
+#!/usr/bin/python3
+
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+##########################################################################
+FROM gcr.io/oss-fuzz-base/base-builder-python
+RUN pip3 install --upgrade pip HTMLParser
+RUN git clone https://github.com/benjaminp/six six
+COPY *.sh *py $SRC/
+WORKDIR $SRC/six
diff --git a/projects/six/build.sh b/projects/six/build.sh
new file mode 100644
index 000000000..a911cd314
--- /dev/null
+++ b/projects/six/build.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -eu
+
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+##########################################################################
+pip3 install .
+for fuzzer in $(find $SRC -name 'fuzz_*.py'); do
+  compile_python_fuzzer $fuzzer --hidden-import=html.parser
+done
diff --git a/projects/six/fuzz_six.py b/projects/six/fuzz_six.py
new file mode 100644
index 000000000..cd3746ed3
--- /dev/null
+++ b/projects/six/fuzz_six.py
@@ -0,0 +1,69 @@
+#!/usr/bin/python3
+
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+##########################################################################
+import sys
+import atheris
+
+import six
+import json
+
+
+@atheris.instrument_func
+def TestOneInput(data):
+  fdp = atheris.FuzzedDataProvider(data)
+  val_1 = fdp.ConsumeUnicodeNoSurrogates(24)
+
+  try:
+    six.remove_move(val_1)
+    six.u(fdp.ConsumeString(fdp.ConsumeIntInRange(1, 24)))
+    six.ensure_text(fdp.ConsumeUnicodeNoSurrogates(fdp.ConsumeIntInRange(1,
+                                                                         24)))
+  except (AttributeError,):
+    pass
+  try:
+    json_val = json.loads(
+        fdp.ConsumeUnicodeNoSurrogates(fdp.ConsueIntInRange(1, 1024)))
+  except:
+    json_val = None
+
+  if json_val != None:
+    try:
+      six.ensure_str(json_val)
+      six.ensure_binary(json_val)
+      six.ensure_text(json_val)
+    except TypeError:
+      pass
+
+  try:
+    six.ensure_str(data)
+    six.ensure_binary(data)
+    six.ensure_text(data)
+  except (TypeError, UnicodeDecodeError):
+    pass
+
+  six.moves.html_parser.HTMLParser().unescape(
+      fdp.ConsumeUnicodeNoSurrogates(fdp.ConsumeIntInRange(1, 1024)))
+
+
+def main():
+  atheris.instrument_all()
+  atheris.Setup(sys.argv, TestOneInput)
+  atheris.Fuzz()
+
+
+if __name__ == "__main__":
+  main()
diff --git a/projects/six/project.yaml b/projects/six/project.yaml
new file mode 100644
index 000000000..05d3d22bb
--- /dev/null
+++ b/projects/six/project.yaml
@@ -0,0 +1,10 @@
+fuzzing_engines:
+- libfuzzer
+homepage: https://github.com/benjaminp/six
+language: python
+main_repo: https://github.com/benjaminp/six
+sanitizers:
+- address
+- undefined
+vendor_ccs:
+- david@adalogics.com