diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 5f1e163..3354436 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -14,7 +14,7 @@ concurrency: jobs: validate: - name: Build Package + name: Validate Schema runs-on: ubuntu-20.04 timeout-minutes: 5 steps: @@ -28,3 +28,20 @@ jobs: run: pip install -r scripts/requirements.txt - name: Validate schema run: ./scripts/validate_schema.py codetf.schema.json + test-examples: + name: Test CodeTF Examples + runs-on: ubuntu-20.04 + timeout-minutes: 5 + steps: + - name: Set Up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Check out code + uses: actions/checkout@v4 + - name: Install dependencies + run: pip install check-jsonschema + - name: Validate PyGoat example + run: check-jsonschema --schemafile codetf.schema.json -d examples/pygoat.codetf.json + - name: Validate WebGoat example + run: check-jsonschema --schemafile codetf.schema.json -d examples/pygoat.codetf.json diff --git a/examples/pygoat.codetf.json b/examples/pygoat.codetf.json new file mode 100644 index 0000000..25cf1e3 --- /dev/null +++ b/examples/pygoat.codetf.json @@ -0,0 +1 @@ +{"run": {"vendor": "pixee", "tool": "codemodder-python", "version": "0.81.1.dev13+g03f0a72", "sarifs": [], "elapsed": "34437", "commandLine": "codemodder /Users/danieldavella/pygoat --output=pygoat.codetf.json --dry-run", "directory": "/Users/danieldavella/pygoat"}, "results": [{"codemod": "pixee:python/add-requests-timeouts", "summary": "Add timeout to `requests` calls", "description": "Many developers will be surprised to learn that `requests` library calls do not include timeouts by default. This means that an attempted request could hang indefinitely if no connection is established or if no data is received from the server. \n\nThe [requests documentation](https://requests.readthedocs.io/en/latest/user/advanced/#timeouts) suggests that most calls should explicitly include a `timeout` parameter. This codemod adds a default timeout value in order to set an upper bound on connection times and ensure that requests connect or fail in a timely manner. This value also ensures the connection will timeout if the server does not respond with data within a reasonable amount of time. \n\nWhile timeout values will be application dependent, we believe that this codemod adds a reasonable default that serves as an appropriate ceiling for most situations. \n\nOur changes look like the following:\n```diff\n import requests\n \n- requests.get(\"http://example.com\")\n+ requests.get(\"http://example.com\", timeout=60)\n```\n", "references": [{"url": "https://docs.python-requests.org/en/master/user/quickstart/#timeouts", "description": "https://docs.python-requests.org/en/master/user/quickstart/#timeouts"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/apis.py", "diff": "--- \n+++ \n@@ -73,10 +73,10 @@\n f.close()\n url = \"http://127.0.0.1:8000/2021/discussion/A9/target\"\n payload={'csrfmiddlewaretoken': csrf_token }\n- requests.request(\"GET\", url)\n- requests.request(\"POST\", url)\n- requests.request(\"PATCH\", url, data=payload)\n- requests.request(\"DELETE\", url)\n+ requests.request(\"GET\", url, timeout=60)\n+ requests.request(\"POST\", url, timeout=60)\n+ requests.request(\"PATCH\", url, data=payload, timeout=60)\n+ requests.request(\"DELETE\", url, timeout=60)\n f = open('test.log', 'r')\n lines = f.readlines()\n f.close()\n", "changes": [{"lineNumber": "76", "description": "Add timeout to `requests` call", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "77", "description": "Add timeout to `requests` call", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "78", "description": "Add timeout to `requests` call", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "79", "description": "Add timeout to `requests` call", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "introduction/playground/A6/soln.py", "diff": "--- \n+++ \n@@ -5,7 +5,7 @@\n for i in list_of_modules:\n k = i.split(\"==\")\n url = f\"https://pypi.org/pypi/{k[0]}/{k[1]}/json\"\n- response = requests.get(url)\n+ response = requests.get(url, timeout=60)\n response.raise_for_status()\n info = response.json()\n existing_vuln = info['vulnerabilities']\n", "changes": [{"lineNumber": "8", "description": "Add timeout to `requests` call", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "introduction/playground/A6/utility.py", "diff": "--- \n+++ \n@@ -5,7 +5,7 @@\n for i in list_of_modules:\n k = i.split(\"==\")\n url = f\"https://pypi.org/pypi/{k[0]}/{k[1]}/json\"\n- response = requests.get(url)\n+ response = requests.get(url, timeout=60)\n response.raise_for_status()\n info = response.json()\n existing_vuln = info['vulnerabilities']\n", "changes": [{"lineNumber": "8", "description": "Add timeout to `requests` call", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -951,7 +951,7 @@\n elif request.method == \"POST\":\n url = request.POST[\"url\"]\n try:\n- response = requests.get(url)\n+ response = requests.get(url, timeout=60)\n return render(request, \"Lab/ssrf/ssrf_lab2.html\", {\"response\": response.content.decode()})\n except:\n return render(request, \"Lab/ssrf/ssrf_lab2.html\", {\"error\": \"Invalid URL\"})\n", "changes": [{"lineNumber": "954", "description": "Add timeout to `requests` call", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/django-debug-flag-on", "summary": "Disable Django Debug Mode", "description": "This codemod will flip Django's `DEBUG` flag to `False` if it's `True` on the `settings.py` file within Django's default directory structure.\n\nHaving the debug flag on may result in sensitive information exposure. When an exception occurs while the `DEBUG` flag in on, it will dump metadata of your environment, including the settings module. The attacker can purposefully request a non-existing url to trigger an exception and gather information about your system.\n\n```diff\n- DEBUG = True\n+ DEBUG = False\n```\n", "references": [{"url": "https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure", "description": "https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure"}, {"url": "https://docs.djangoproject.com/en/4.2/ref/settings/#std-setting-DEBUG", "description": "https://docs.djangoproject.com/en/4.2/ref/settings/#std-setting-DEBUG"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "pygoat/settings.py", "diff": "--- \n+++ \n@@ -26,7 +26,7 @@\n SENSITIVE_DATA = 'FLAGTHATNEEDSTOBEFOUND'\n \n # SECURITY WARNING: don't run with debug turned on in production!\n-DEBUG = True\n+DEBUG = False\n \n ALLOWED_HOSTS = ['pygoat.herokuapp.com', '0.0.0.0.']\n \n", "changes": [{"lineNumber": "29", "description": "Flip `Django` debug flag to off.", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/django-session-cookie-secure-off", "summary": "Secure Setting for Django `SESSION_COOKIE_SECURE` flag", "description": "This codemod will set Django's `SESSION_COOKIE_SECURE` flag to `True` if it's `False` or missing on the `settings.py` file within Django's default directory structure.\n\n```diff\n+ SESSION_COOKIE_SECURE = True\n```\n\nSetting this flag on ensures that the session cookies are only sent under an HTTPS connection. Leaving this flag off may enable an attacker to use a sniffer to capture the unencrypted session cookie and hijack the user's session.\n", "references": [{"url": "https://owasp.org/www-community/controls/SecureCookieAttribute", "description": "https://owasp.org/www-community/controls/SecureCookieAttribute"}, {"url": "https://docs.djangoproject.com/en/4.2/ref/settings/#session-cookie-secure", "description": "https://docs.djangoproject.com/en/4.2/ref/settings/#session-cookie-secure"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "pygoat/settings.py", "diff": "--- \n+++ \n@@ -167,4 +167,5 @@\n }\n \n SECRET_COOKIE_KEY = \"PYGOAT\"\n-CSRF_TRUSTED_ORIGINS = [\"http://127.0.0.1:8000\",\"http://0.0.0.0:8000\",\"http://172.16.189.10\"]\n+CSRF_TRUSTED_ORIGINS = [\"http://127.0.0.1:8000\",\"http://0.0.0.0:8000\",\"http://172.16.189.10\"]\n+SESSION_COOKIE_SECURE = True", "changes": [{"lineNumber": "171", "description": "Sets Django's `SESSION_COOKIE_SECURE` flag if off or missing.", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/enable-jinja2-autoescape", "summary": "Enable Jinja2 Autoescape", "description": "This codemod enables autoescaping of HTML content in `jinja2`. Unfortunately, the jinja2 default behavior is to not autoescape when rendering templates, which makes your applications potentially vulnerable to Cross-Site Scripting (XSS) attacks.\n\nOur codemod checks if you forgot to enable autoescape or if you explicitly disabled it. The change looks as follows:\n\n```diff\n from jinja2 import Environment\n\n- env = Environment()\n- env = Environment(autoescape=False, loader=some_loader)\n+ env = Environment(autoescape=True)\n+ env = Environment(autoescape=True, loader=some_loader)\n ...\n```\n", "references": [{"url": "https://owasp.org/www-community/attacks/xss/", "description": "https://owasp.org/www-community/attacks/xss/"}, {"url": "https://jinja.palletsprojects.com/en/3.1.x/api/#autoescaping", "description": "https://jinja.palletsprojects.com/en/3.1.x/api/#autoescaping"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/fix-deprecated-abstractproperty", "summary": "Replace Deprecated `abc` Decorators", "description": "The `@abstractproperty`, `@abstractclassmethod`, and `@abstractstaticmethod` decorators from `abc` has been [deprecated](https://docs.python.org/3/library/abc.html) since Python 3.3. This is because it's possible to use `@property`, `@classmethod`, and `@staticmethod` in combination with `@abstractmethod`. \n\nOur changes look like the following:\n```diff\n import abc\n\n class Foo:\n- @abc.abstractproperty\n+ @property\n+ @abc.abstractmethod\n def bar():\n ...\n```\n\nand similarly for `@abstractclassmethod` and `@abstractstaticmethod`.\n", "references": [{"url": "https://docs.python.org/3/library/abc.html#abc.abstractproperty", "description": "https://docs.python.org/3/library/abc.html#abc.abstractproperty"}, {"url": "https://docs.python.org/3/library/abc.html#abc.abstractclassmethod", "description": "https://docs.python.org/3/library/abc.html#abc.abstractclassmethod"}, {"url": "https://docs.python.org/3/library/abc.html#abc.abstractstaticmethod", "description": "https://docs.python.org/3/library/abc.html#abc.abstractstaticmethod"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/fix-mutable-params", "summary": "Replace Mutable Default Parameters", "description": "Using mutable values for default arguments is not a safe practice.\nLook at the following very simple example code:\n\n```python\ndef foo(x, y=[]):\n y.append(x)\n print(y)\n```\n\nThe function `foo` doesn't do anything very interesting; it just prints the result of `x` appended to `y`. Naively we might expect this to simply print an array containing only `x` every time `foo` is called, like this:\n\n```python\n>>> foo(1)\n[1]\n>>> foo(2)\n[2]\n```\n\nBut that's not what happens!\n\n```python\n>>> foo(1)\n[1]\n>>> foo(2)\n[1, 2]\n```\n\nThe value of `y` is preserved between calls! This might seem surprising, and it is. It's due to the way that scope works for function arguments in Python.\n\nThe result is that any default argument value will be preserved between function calls. This is problematic for *mutable* types, including things like `list`, `dict`, and `set`.\n\nRelying on this behavior is unpredictable and generally considered to be unsafe. Most of us who write code like this were not anticipating the surprising behavior, so it's best to fix it.\n\nOur codemod makes an update that looks like this:\n```diff\n- def foo(x, y=[]):\n+ def foo(x, y=None):\n+ y = [] if y is None else y\n y.append(x)\n print(y)\n```\n\nUsing `None` is a much safer default. The new code checks if `None` is passed, and if so uses an empty `list` for the value of `y`. This will guarantee consistent and safe behavior between calls.\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/harden-pickle-load", "summary": "Harden `pickle.load()` against deserialization attacks", "description": "Python's `pickle` module is notoriouly insecure. While it is very useful for serializing and deserializing Python objects, it is not safe to use `pickle` to load data from untrusted sources. This is because `pickle` can execute arbitrary code when loading data. This can be exploited by an attacker to execute arbitrary code on your system. Unlike `yaml` there is no concept of a \"safe\" loader in `pickle`. Therefore, it is recommended to avoid `pickle` and to use a different serialization format such as `json` or `yaml` when working with untrusted data.\n\nHowever, if you must use `pickle` to load data from an untrusted source, we recommend using the open-source `fickling` library. `fickling` is a drop-in replacement for `pickle` that validates the data before loading it and checks for the possibility of code execution. This makes it much safer (although still not entirely safe) to use `pickle` to load data from untrusted sources.\n\nThis codemod replaces calls to `pickle.load` with `fickling.load` in Python code. It also adds an import statement for `fickling` if it is not already present. \n\nThe changes look like the following:\n```diff\n- import pickle\n+ import fickling\n \n- data = pickle.load(file)\n+ data = fickling.load(file)\n```\n", "references": [{"url": "https://docs.python.org/3/library/pickle.html", "description": "https://docs.python.org/3/library/pickle.html"}, {"url": "https://owasp.org/www-community/vulnerabilities/Deserialization_of_untrusted_data", "description": "https://owasp.org/www-community/vulnerabilities/Deserialization_of_untrusted_data"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/Deserialization_Cheat_Sheet.html#clear-box-review_1", "description": "https://cheatsheetseries.owasp.org/cheatsheets/Deserialization_Cheat_Sheet.html#clear-box-review_1"}, {"url": "https://github.com/trailofbits/fickling", "description": "https://github.com/trailofbits/fickling"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/harden-pyyaml", "summary": "Replace unsafe `pyyaml` loader with `SafeLoader`", "description": "The default loaders in PyYAML are not safe to use with untrusted data. They potentially make your application vulnerable to arbitrary code execution attacks. If you open a YAML file from an untrusted source, and the file is loaded with the default loader, an attacker could execute arbitrary code on your machine.\n\nThis codemod hardens all [`yaml.load()`](https://pyyaml.org/wiki/PyYAMLDocumentation) calls against such attacks by replacing the default loader with `yaml.SafeLoader`. This is the recommended loader for loading untrusted data. For most use cases it functions as a drop-in replacement for the default loader.\n\nCalling `yaml.load()` without an explicit loader argument is equivalent to calling it with `Loader=yaml.Loader`, which is unsafe. This usage [has been deprecated](https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input\\)-Deprecation) since PyYAML 5.1. This codemod will add an explicit `SafeLoader` argument to all `yaml.load()` calls that don't use an explicit loader.\n\nThe changes from this codemod look like the following:\n```diff\n import yaml\n data = b'!!python/object/apply:subprocess.Popen \\\\n- ls'\n- deserialized_data = yaml.load(data, yaml.Loader)\n+ deserialized_data = yaml.load(data, Loader=yaml.SafeLoader)\n```\n", "references": [{"url": "https://owasp.org/www-community/vulnerabilities/Deserialization_of_untrusted_data", "description": "https://owasp.org/www-community/vulnerabilities/Deserialization_of_untrusted_data"}, {"url": "https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation", "description": "https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/lab_code/test.py", "diff": "--- \n+++ \n@@ -17,7 +17,7 @@\n '''\n import yaml, subprocess\n stream = open('/home/fox/test.yaml', 'r')\n-data = yaml.load(stream)\n+data = yaml.load(stream, Loader=yaml.SafeLoader)\n \n '''\n stdout, stderr = data.communicate()\n", "changes": [{"lineNumber": "20", "description": "Replace unsafe `pyyaml` loader with `SafeLoader` in calls to `yaml.load` or custom loader classes.", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -548,7 +548,7 @@\n try :\n file=request.FILES[\"file\"]\n try :\n- data = yaml.load(file,yaml.Loader)\n+ data = yaml.load(file,yaml.SafeLoader)\n \n return render(request,\"Lab/A9/a9_lab.html\",{\"data\":data})\n except:\n", "changes": [{"lineNumber": "551", "description": "Replace unsafe `pyyaml` loader with `SafeLoader` in calls to `yaml.load` or custom loader classes.", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/harden-ruamel", "summary": "Use `typ='safe'` in ruamel.yaml() Calls", "description": "This codemod hardens any unsafe [`ruamel.yaml.YAML()`](https://yaml.readthedocs.io/en/latest/) calls against attacks that could result from deserializing untrusted data.\n\nThe fix uses a safety check that already exists in the `ruamel` module, replacing an unsafe `typ` argument with `typ=\"safe\"`.\nThe changes from this codemod look like this:\n\n```diff\n from ruamel.yaml import YAML\n- serializer = YAML(typ=\"unsafe\")\n- serializer = YAML(typ=\"base\")\n+ serializer = YAML(typ=\"safe\")\n+ serializer = YAML(typ=\"safe\")\n```\n", "references": [{"url": "https://owasp.org/www-community/vulnerabilities/Deserialization_of_untrusted_data", "description": "https://owasp.org/www-community/vulnerabilities/Deserialization_of_untrusted_data"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/https-connection", "summary": "Enforce HTTPS Connection for `urllib3`", "description": "This codemod replaces calls to `urllib3.connectionpool.HTTPConnectionPool` and `urllib3.HTTPConnectionPool` with their secure variant (`HTTPSConnectionPool`).\n\nProgrammers should opt to use HTTPS over HTTP for secure encrypted communication whenever possible.\n\n```diff\nimport urllib3\n- urllib3.HTTPConnectionPool(\"www.example.com\",\"80\")\n+ urllib3.HTTPSConnectionPool(\"www.example.com\",\"80\")\n```\n", "references": [{"url": "https://owasp.org/www-community/vulnerabilities/Insecure_Transport", "description": "https://owasp.org/www-community/vulnerabilities/Insecure_Transport"}, {"url": "https://urllib3.readthedocs.io/en/stable/reference/urllib3.connectionpool.html#urllib3.HTTPConnectionPool", "description": "https://urllib3.readthedocs.io/en/stable/reference/urllib3.connectionpool.html#urllib3.HTTPConnectionPool"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/jwt-decode-verify", "summary": "Verify JWT Decode", "description": "This codemod ensures calls to [jwt.decode](https://pyjwt.readthedocs.io/en/stable/api.html#jwt.decode) do not disable signature validation and other verifications. It checks that both the `verify` parameter (soon to be deprecated) and any `verify` key in the `options` dict parameter are not assigned to `False`.\n\nOur change looks as follows:\n\n```diff\n import jwt\n ...\n- decoded_payload = jwt.decode(encoded_jwt, SECRET_KEY, algorithms=[\"HS256\"], verify=False)\n+ decoded_payload = jwt.decode(encoded_jwt, SECRET_KEY, algorithms=[\"HS256\"], verify=True)\n ...\n- decoded_payload = jwt.decode(encoded_jwt, SECRET_KEY, algorithms=[\"HS256\"], options={\"verify_signature\": False, \"verify_exp\": False})\n+ decoded_payload = jwt.decode(encoded_jwt, SECRET_KEY, algorithms=[\"HS256\"], options={\"verify_signature\": True, \"verify_exp\": True})\n```\n\nAny `verify` parameter not listed relies on the secure `True` default value.\n", "references": [{"url": "https://pyjwt.readthedocs.io/en/stable/api.html", "description": "https://pyjwt.readthedocs.io/en/stable/api.html"}, {"url": "https://owasp.org/www-project-web-security-testing-guide/latest/4-Web_Application_Security_Testing/06-Session_Management_Testing/10-Testing_JSON_Web_Tokens", "description": "https://owasp.org/www-project-web-security-testing-guide/latest/4-Web_Application_Security_Testing/06-Session_Management_Testing/10-Testing_JSON_Web_Tokens"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/limit-readline", "summary": "Limit readline()", "description": "This codemod hardens all [`readline()`](https://docs.python.org/3/library/io.html#io.IOBase.readline) calls from file objects returned from an `open()` call, `StringIO` and `BytesIO` against denial of service attacks. A stream influenced by an attacker could keep providing bytes until the system runs out of memory, causing a crash.\n\nFixing it is straightforward by providing adding a size argument to any `readline()` calls.\nThe changes from this codemod look like this:\n\n```diff\n file = open('some_file.txt')\n- file.readline()\n+ file.readline(5_000_000)\n```\n", "references": [{"url": "https://cwe.mitre.org/data/definitions/400.html", "description": "https://cwe.mitre.org/data/definitions/400.html"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/safe-lxml-parser-defaults", "summary": "Use Safe Defaults for `lxml` Parsers", "description": "This codemod configures safe parameter values when initializing `lxml.etree.XMLParser`, `lxml.etree.ETCompatXMLParser`, `lxml.etree.XMLTreeBuilder`, or `lxml.etree.XMLPullParser`. If parameters `resolve_entities`, `no_network`, and `dtd_validation` are not set to safe values, your code may be vulnerable to entity expansion attacks and external entity (XXE) attacks.\n\nParameters `no_network` and `dtd_validation` have safe default values of `True` and `False`, respectively, so this codemod will set each to the default safe value if your code has assigned either to an unsafe value.\n\nParameter `resolve_entities` has an unsafe default value of `True`. This codemod will set `resolve_entities=False` if set to `True` or omitted.\n\nThe changes look as follows:\n\n```diff\n import lxml.etree\n\n- parser = lxml.etree.XMLParser()\n- parser = lxml.etree.XMLParser(resolve_entities=True)\n- parser = lxml.etree.XMLParser(resolve_entities=True, no_network=False, dtd_validation=True)\n+ parser = lxml.etree.XMLParser(resolve_entities=False)\n+ parser = lxml.etree.XMLParser(resolve_entities=False)\n+ parser = lxml.etree.XMLParser(resolve_entities=False, no_network=True, dtd_validation=False)\n```\n", "references": [{"url": "https://lxml.de/apidoc/lxml.etree.html#lxml.etree.XMLParser", "description": "https://lxml.de/apidoc/lxml.etree.html#lxml.etree.XMLParser"}, {"url": "https://owasp.org/www-community/vulnerabilities/XML_External_Entity_(XXE)_Processing", "description": "https://owasp.org/www-community/vulnerabilities/XML_External_Entity_(XXE)_Processing"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html", "description": "https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/safe-lxml-parsing", "summary": "Use Safe Parsers in `lxml` Parsing Functions", "description": "This codemod sets the `parser` parameter in calls to `lxml.etree.parse` and `lxml.etree.fromstring` if omitted or set to `None` (the default value). Unfortunately, the default `parser=None` means `lxml` will rely on an unsafe parser, making your code potentially vulnerable to entity expansion attacks and external entity (XXE) attacks.\n\nThe changes look as follows:\n\n```diff\n import lxml.etree\n- lxml.etree.parse(\"path_to_file\")\n- lxml.etree.fromstring(\"xml_str\")\n+ lxml.etree.parse(\"path_to_file\", parser=lxml.etree.XMLParser(resolve_entities=False))\n+ lxml.etree.fromstring(\"xml_str\", parser=lxml.etree.XMLParser(resolve_entities=False))\n```\n", "references": [{"url": "https://lxml.de/apidoc/lxml.etree.html#lxml.etree.XMLParser", "description": "https://lxml.de/apidoc/lxml.etree.html#lxml.etree.XMLParser"}, {"url": "https://owasp.org/www-community/vulnerabilities/XML_External_Entity_(XXE)_Processing", "description": "https://owasp.org/www-community/vulnerabilities/XML_External_Entity_(XXE)_Processing"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html", "description": "https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/sandbox-process-creation", "summary": "Sandbox Process Creation", "description": "This codemod sandboxes all instances of [subprocess.run](https://docs.python.org/3/library/subprocess.html#subprocess.run) and [subprocess.call](https://docs.python.org/3/library/subprocess.html#subprocess.call) to offer protection against attack.\n\nLeft unchecked, `subprocess.run` and `subprocess.call` can execute any arbitrary system command. If an attacker can control part of the strings used as program paths or arguments, they could execute arbitrary programs, install malware, and anything else they could do if they had a shell open on the application host.\n\nOur change introduces a sandbox which protects the application:\n\n```diff\n import subprocess\n+ from security import safe_command\n ...\n- subprocess.run(\"echo 'hi'\", shell=True)\n+ safe_command.run(subprocess.run, \"echo 'hi'\", shell=True)\n ...\n- subprocess.call([\"ls\", \"-l\"])\n+ safe_command.call(subprocess.call, [\"ls\", \"-l\"])\n```\n\nThe default `safe_command` restrictions applied are the following:\n* **Prevent command chaining**. Many exploits work by injecting command separators and causing the shell to interpret a second, malicious command. The `safe_command` functions attempt to parse the given command, and throw a `SecurityException` if multiple commands are present.\n* **Prevent arguments targeting sensitive files.** There is little reason for custom code to target sensitive system files like `/etc/passwd`, so the sandbox prevents arguments that point to these files that may be targets for exfiltration.\n\nThere are [more options for sandboxing](https://github.com/pixee/python-security/blob/main/src/security/safe_command/api.py#L5) if you are interested in locking down system commands even more.\n\n## Dependency Updates\n\nThis codemod relies on an external dependency. We have automatically added this dependency to your project's `requirements.txt` file. \n\nThis library holds security tools for protecting Python API calls. \n\nThere are a number of places where Python project dependencies can be expressed, including `setup.py`, `pyproject.toml`, `setup.cfg`, and `requirements.txt` files. If this change is incorrect, or if you are using another packaging system such as `poetry`, it may be necessary for you to manually add the dependency to the proper location in your project.\n", "references": [{"url": "https://github.com/pixee/python-security/blob/main/src/security/safe_command/api.py", "description": "https://github.com/pixee/python-security/blob/main/src/security/safe_command/api.py"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/OS_Command_Injection_Defense_Cheat_Sheet.html", "description": "https://cheatsheetseries.owasp.org/cheatsheets/OS_Command_Injection_Defense_Cheat_Sheet.html"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/mitre.py", "diff": "--- \n+++ \n@@ -8,6 +8,8 @@\n import subprocess\n from .models import CSRF_user_tbl\n from django.views.decorators.csrf import csrf_exempt\n+from security import safe_command\n+\n # import os\n \n ## Mitre top1 | CWE:787\n@@ -227,7 +229,7 @@\n return render(request, 'mitre/mitre_lab_17.html')\n \n def command_out(command):\n- process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n+ process = safe_command.run(subprocess.Popen, command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n return process.communicate()\n \n \n", "changes": [{"lineNumber": "230", "description": "Replaces subprocess.{func} with more secure safe_command library functions.", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -39,6 +39,8 @@\n import logging\n import requests\n import re\n+from security import safe_command\n+\n #*****************************************Login and Registration****************************************************#\n \n def register(request):\n@@ -418,8 +420,7 @@\n \n try:\n # output=subprocess.check_output(command,shell=True,encoding=\"UTF-8\")\n- process = subprocess.Popen(\n- command,\n+ process = safe_command.run(subprocess.Popen, command,\n shell=True,\n stdout=subprocess.PIPE, \n stderr=subprocess.PIPE)\n", "changes": [{"lineNumber": "421", "description": "Replaces subprocess.{func} with more secure safe_command library functions.", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "uninstaller.py", "diff": "--- \n+++ \n@@ -6,6 +6,7 @@\n import colorama\n import subprocess\n from shutil import rmtree, which\n+from security import safe_command\n \n \n # Platform indepent way to check if user is admin\n@@ -37,7 +38,7 @@\n # It is important to upgrade pip first to avoid environment errors\n if (platform.system != 'Windows'):\n pip_v = \"pip3\" if (which('pip3') is not None) else \"pip\"\n- subprocess.run([pip_v,\n+ safe_command.run(subprocess.run, [pip_v,\n \"install\",\n \"--upgrade\",\n \"pip\"],\n", "changes": [{"lineNumber": "40", "description": "Replaces subprocess.{func} with more secure safe_command library functions.", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "requirements.txt", "diff": "--- \n+++ \n@@ -31,3 +31,4 @@\n Werkzeug==2.1.2\n whitenoise==6.2.0\n zipp==3.8.0\n+security==1.2.1 \\\n --hash=sha256:4ca5f8cfc6b836e2192a84bb5a28b72c17f3cd1abbfe3281f917394c6e6c9238 \\\n --hash=sha256:0a9dc7b457330e6d0f92bdae3603fecb85394beefad0fd3b5058758a58781ded", "changes": [{"lineNumber": "34", "description": "This library holds security tools for protecting Python API calls.\n\nLicense: [MIT](https://opensource.org/license/MIT/) \u2705 [Open Source](https://github.com/pixee/python-security) \u2705 [More facts](https://pypi.org/project/security/)\n", "properties": {"contextual_description": true, "contextual_description_position": "right"}, "diffSide": "right", "packageActions": [{"action": "ADD", "result": "COMPLETED", "package": "security==1.2.1"}]}]}]}, {"codemod": "pixee:python/remove-future-imports", "summary": "Remove deprecated `__future__` imports", "description": "Many older codebases have `__future__` imports for forwards compatibility with features. As of this writing, all but one of those features is now stable in all currently supported versions of Python and so the imports are no longer needed. While such imports are harmless, they are also unnecessary and in most cases you probably just forgot to remove them. \n\nThis codemod removes all such `__future__` imports, preserving only those that are still necessary for forwards compatibility. \n\nOur changes look like the following:\n```diff\n import os\n-from __future__ import print_function\n\n print(\"HELLO\")\n```\n", "references": [{"url": "https://docs.python.org/3/library/__future__.html", "description": "https://docs.python.org/3/library/__future__.html"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/remove-unnecessary-f-str", "summary": "Remove Unnecessary F-strings", "description": "This codemod converts any f-strings without interpolated variables into regular strings.\nIn these cases the use of f-string is not necessary; a simple string literal is sufficient. \n\nWhile in some (extreme) cases we might expect a very modest performance\nimprovement, in general this is a fix that improves the overall cleanliness and\nquality of your code.\n\n```diff\n- var = f\"hello\"\n+ var = \"hello\"\n ...\n```\n", "references": [{"url": "https://pylint.readthedocs.io/en/latest/user_guide/messages/warning/f-string-without-interpolation.html", "description": "https://pylint.readthedocs.io/en/latest/user_guide/messages/warning/f-string-without-interpolation.html"}, {"url": "https://github.com/Instagram/LibCST/blob/main/libcst/codemod/commands/unnecessary_format_string.py", "description": "https://github.com/Instagram/LibCST/blob/main/libcst/codemod/commands/unnecessary_format_string.py"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/requests-verify", "summary": "Verify SSL Certificates for Requests.", "description": "This codemod checks that calls to the `requests` module API or the `httpx` library use `verify=True` or a path to a CA bundle to ensure TLS certificate validation.\n\nThe [requests documentation](https://requests.readthedocs.io/en/latest/api/) warns that the `verify` flag\n> When set to False, requests will accept any TLS certificate presented by the server, and will ignore hostname mismatches and/or expired certificates, which will make your application vulnerable to man-in-the-middle (MitM) attacks. Setting verify to False may be useful during local development or testing.\n\nSimilarly, setting `verify=False` when using the `httpx` library to make requests disables certificate verification.\n\nThe changes from this codemod look like this:\n\n\n```diff\n import requests\n \n- requests.get(\"www.google.com\", ...,verify=False)\n+ requests.get(\"www.google.com\", ...,verify=True)\n...\nimport httpx\n \n- httpx.get(\"www.google.com\", ...,verify=False)\n+ httpx.get(\"www.google.com\", ...,verify=True)\n\n```\n\nThis codemod also checks other methods in the `requests` module and `httpx` library that accept a `verify` flag (e.g. `requests.post`, `httpx.AsyncClient`, etc.)\n", "references": [{"url": "https://requests.readthedocs.io/en/latest/api/", "description": "https://requests.readthedocs.io/en/latest/api/"}, {"url": "https://www.python-httpx.org/", "description": "https://www.python-httpx.org/"}, {"url": "https://owasp.org/www-community/attacks/Manipulator-in-the-middle_attack", "description": "https://owasp.org/www-community/attacks/Manipulator-in-the-middle_attack"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/secure-flask-cookie", "summary": "Use Safe Parameters in `flask` Response `set_cookie` Call", "description": "This codemod sets the most secure parameters when Flask applications call `set_cookie` on a response object. Without these parameters, your Flask\napplication cookies may be vulnerable to being intercepted and used to gain access to sensitive data.\n\nThe changes from this codemod look like this:\n\n```diff\n from flask import Flask, session, make_response\n app = Flask(__name__)\n @app.route('/')\n def index():\n resp = make_response('Custom Cookie Set')\n - resp.set_cookie('custom_cookie', 'value')\n + resp.set_cookie('custom_cookie', 'value', secure=True, httponly=True, samesite='Lax')\n return resp\n```\n", "references": [{"url": "https://flask.palletsprojects.com/en/3.0.x/api/#flask.Response.set_cookie", "description": "https://flask.palletsprojects.com/en/3.0.x/api/#flask.Response.set_cookie"}, {"url": "https://owasp.org/www-community/controls/SecureCookieAttribute", "description": "https://owasp.org/www-community/controls/SecureCookieAttribute"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/secure-random", "summary": "Secure Source of Randomness", "description": "This codemod replaces all instances of functions in the `random` module (e.g. `random.random()` with their, much more secure, equivalents from the `secrets` module (e.g. `secrets.SystemRandom().random()`).\n\nThere is significant algorithmic complexity in getting computers to generate genuinely unguessable random bits. The `random.random()` function uses a method of pseudo-random number generation that unfortunately emits fairly predictable numbers.\n\nIf the numbers it emits are predictable, then it's obviously not safe to use in cryptographic operations, file name creation, token construction, password generation, and anything else that's related to security. In fact, it may affect security even if it's not directly obvious.\n\nSwitching to a more secure version is simple and the changes look something like this:\n\n```diff\n- import random\n+ import secrets\n ...\n- random.random()\n+ secrets.SystemRandom().random()\n```\n", "references": [{"url": "https://owasp.org/www-community/vulnerabilities/Insecure_Randomness", "description": "https://owasp.org/www-community/vulnerabilities/Insecure_Randomness"}, {"url": "https://docs.python.org/3/library/random.html", "description": "https://docs.python.org/3/library/random.html"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -6,7 +6,6 @@\n from requests.structures import CaseInsensitiveDict\n from django.contrib.auth import login,authenticate\n from django.contrib.auth.forms import UserCreationForm\n-import random\n import string\n import os\n from hashlib import md5\n@@ -16,7 +15,6 @@\n #*****************************************Lab Requirements****************************************************#\n \n from .models import FAANG,info,login,comments,otp\n-from random import randint\n from xml.dom.pulldom import parseString, START_ELEMENT\n from xml.sax.handler import feature_external_ges\n from xml.sax import make_parser\n@@ -39,6 +37,8 @@\n import logging\n import requests\n import re\n+import secrets\n+\n #*****************************************Login and Registration****************************************************#\n \n def register(request):\n@@ -484,7 +484,7 @@\n def Otp(request):\n if request.method==\"GET\":\n email=request.GET.get('email')\n- otpN=randint(100,999)\n+ otpN=secrets.SystemRandom().randint(100,999)\n if email and otpN:\n if email==\"admin@pygoat.com\":\n otp.objects.filter(id=2).update(otp=otpN)\n@@ -668,7 +668,7 @@\n #*********************************************************A11*************************************************#\n \n def gentckt():\n- return (''.join(random.choices(string.ascii_uppercase + string.ascii_lowercase, k=10)))\n+ return (''.join(secrets.SystemRandom().choices(string.ascii_uppercase + string.ascii_lowercase, k=10)))\n \n def insec_desgine(request):\n if request.user.is_authenticated:\n", "changes": [{"lineNumber": "487", "description": "Replace random.{func} with more secure secrets library functions.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "671", "description": "Replace random.{func} with more secure secrets library functions.", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/secure-tempfile", "summary": "Upgrade and Secure Temp File Creation", "description": "This codemod replaces all `tempfile.mktemp` calls to the more secure `tempfile.mkstemp`.\n\nThe Python [tempfile documentation](https://docs.python.org/3/library/tempfile.html#tempfile.mktemp) is explicit\nthat `tempfile.mktemp` should be deprecated to avoid an unsafe and unexpected race condition.\nThe changes from this codemod look like this:\n\n\n```diff\n import tempfile\n- tempfile.mktemp(...)\n+ tempfile.mkstemp(...)\n```\n", "references": [{"url": "https://docs.python.org/3/library/tempfile.html#tempfile.mktemp", "description": "https://docs.python.org/3/library/tempfile.html#tempfile.mktemp"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/upgrade-sslcontext-minimum-version", "summary": "Upgrade SSLContext Minimum Version", "description": "This codemod replaces all unsafe and/or deprecated SSL/TLS versions when used\nto set the `ssl.SSLContext.minimum_version` attribute. It uses\n`ssl.TLSVersion.TLSv1_2` instead, which ensures a safe default minimum TLS\nversion.\n\nOur change involves modifying the `minimum_version` attribute of\n`ssl.SSLContext` instances to use `ssl.TLSVersion.TLSv1_2`.\n\n```diff\n import ssl\n context = ssl.SSLContext(protocol=PROTOCOL_TLS_CLIENT)\n- context.minimum_version = ssl.TLSVersion.SSLv3\n+ context.minimum_version = ssl.TLSVersion.TLSv1_2\n```\n\nThere is no functional difference between the unsafe and safe versions, and all modern servers offer TLSv1.2.\n", "references": [{"url": "https://docs.python.org/3/library/ssl.html#security-considerations", "description": "https://docs.python.org/3/library/ssl.html#security-considerations"}, {"url": "https://datatracker.ietf.org/doc/rfc8996/", "description": "https://datatracker.ietf.org/doc/rfc8996/"}, {"url": "https://www.digicert.com/blog/depreciating-tls-1-0-and-1-1", "description": "https://www.digicert.com/blog/depreciating-tls-1-0-and-1-1"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/upgrade-sslcontext-tls", "summary": "Upgrade TLS Version In SSLContext", "description": "This codemod replaces the use of all unsafe and/or deprecated SSL/TLS versions\nin the `ssl.SSLContext` constructor. It uses `PROTOCOL_TLS_CLIENT` instead,\nwhich ensures a safe default TLS version. It also sets the `protocol` parameter\nto `PROTOCOL_TLS_CLIENT` in calls without it, which is now deprecated.\n\nOur change involves modifying the argument to `ssl.SSLContext()` to\nuse `PROTOCOL_TLS_CLIENT`.\n\n```diff\n import ssl\n- context = ssl.SSLContext() \n+ context = ssl.SSLContext(protocol=PROTOCOL_TLS_CLIENT)\n- context = ssl.SSLContext(protocol=PROTOCOL_SSLv3)\n+ context = ssl.SSLContext(protocol=PROTOCOL_TLS_CLIENT)\n```\n\nThere is no functional difference between the unsafe and safe versions, and all modern servers offer TLSv1.2.\n\nThe use of explicit TLS versions (even safe ones) is deprecated by the `ssl`\nmodule, so it is necessary to choose either `PROTOCOL_TLS_CLIENT` or\n`PROTOCOL_TLS_SERVER`. Using `PROTOCOL_TLS_CLIENT` is expected to be the\ncorrect choice for most applications but in some cases it will be necessary to\nuse `PROTOCOL_TLS_SERVER` instead.\n", "references": [{"url": "https://docs.python.org/3/library/ssl.html#security-considerations", "description": "https://docs.python.org/3/library/ssl.html#security-considerations"}, {"url": "https://datatracker.ietf.org/doc/rfc8996/", "description": "https://datatracker.ietf.org/doc/rfc8996/"}, {"url": "https://www.digicert.com/blog/depreciating-tls-1-0-and-1-1", "description": "https://www.digicert.com/blog/depreciating-tls-1-0-and-1-1"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/url-sandbox", "summary": "Sandbox URL Creation", "description": "This codemod sandboxes calls to [`requests.get`](https://requests.readthedocs.io/en/latest/api/#requests.get) to be more resistant to Server-Side Request Forgery (SSRF) attacks.\n\nMost of the time when you make a `GET` request to a URL, you're intending to reference an HTTP endpoint, like an internal microservice. However, URLs can point to local file system files, a Gopher stream in your local network, a JAR file on a remote Internet site, and all kinds of other unexpected and undesirable outcomes. When the URL values are influenced by attackers, they can trick your application into fetching internal resources, running malicious code, or otherwise harming the system.\nConsider the following code for a Flask app:\n\n```python\nfrom flask import Flask, request\nimport requests\n\napp = Flask(__name__)\n\n@app.route(\"/request-url\")\ndef request_url():\n url = request.args[\"loc\"]\n resp = requests.get(url)\n ...\n```\n\nIn this case, an attacker could supply a value like `\"http://169.254.169.254/user-data/\"` and attempt to access user information.\n\nOur changes introduce sandboxing around URL creation that force developers to specify some boundaries on the types of URLs they expect to create:\n\n```diff\n from flask import Flask, request\n- import requests\n+ from security import safe_requests\n\n app = Flask(__name__)\n\n @app.route(\"/request-url\")\n def request_url():\n url = request.args[\"loc\"]\n- resp = requests.get(url)\n+ resp = safe_requests.get(url)\n ...\n```\n\nThis change alone reduces attack surface significantly because the default behavior of `safe_requests.get` raises a `SecurityException` if\na user attempts to access a known infrastructure location, unless specifically disabled.\n\n\nIf you have feedback on this codemod, [please let us know](mailto:feedback@pixee.ai)!\n\n## F.A.Q. \n\n### Why does this codemod require a Pixee dependency?\n\nWe always prefer to use built-in Python functions or one from a well-known and trusted community dependency. However, we cannot find any such control. If you know of one, [please let us know](https://ask.pixee.ai/feedback).\n\n### Why is this codemod marked as Merge After Cursory Review?\n\nBy default, the protection only weaves in 2 checks, which we believe will not cause any issues with the vast majority of code:\n1. The given URL must be HTTP/HTTPS.\n2. The given URL must not point to a \"well-known infrastructure target\", which includes things like AWS Metadata Service endpoints, and internal routers (e.g., 192.168.1.1) which are common targets of attacks.\n\nHowever, on rare occasions an application may use a URL protocol like \"file://\" or \"ftp://\" in backend or middleware code.\n\nIf you want to allow those protocols, change the incoming PR to look more like this and get the best security possible:\n\n```diff\n-resp = requests.get(url)\n+resp = safe_requests.get(url, allowed_protocols=(\"ftp\",))\n```\n\n## Dependency Updates\n\nThis codemod relies on an external dependency. However, we were unable to automatically add the dependency to your project. \n\nThis library holds security tools for protecting Python API calls. \n\nThere are a number of places where Python project dependencies can be expressed, including `setup.py`, `pyproject.toml`, `setup.cfg`, and `requirements.txt` files. You may need to manually add this dependency to the proper location in your project.\n\n### Manual Installation\n\nFor `setup.py`:\n```diff\n install_requires=[\n+ \"security==1.2.1\",\n ],\n```\n\nFor `pyproject.toml` (using `setuptools`):\n```diff\n [project]\n dependencies = [\n+ \"security==1.2.1\",\n ]\n```\n\nFor `setup.cfg`:\n```diff\n [options]\n install_requires =\n+ security==1.2.1\n```\n\nFor `requirements.txt`:\n```diff\n+security==1.2.1\n```\n\nFor more information on adding dependencies to `setuptools` projects, see [the setuptools documentation](https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#declaring-required-dependency). \n\nIf you are using another build system, please refer to the documentation for that system to determine how to add dependencies.\n", "references": [{"url": "https://github.com/pixee/python-security/blob/main/src/security/safe_requests/api.py", "description": "https://github.com/pixee/python-security/blob/main/src/security/safe_requests/api.py"}, {"url": "https://portswigger.net/web-security/ssrf", "description": "https://portswigger.net/web-security/ssrf"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html", "description": "https://cheatsheetseries.owasp.org/cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html"}, {"url": "https://www.rapid7.com/blog/post/2021/11/23/owasp-top-10-deep-dive-defending-against-server-side-request-forgery/", "description": "https://www.rapid7.com/blog/post/2021/11/23/owasp-top-10-deep-dive-defending-against-server-side-request-forgery/"}, {"url": "https://blog.assetnote.io/2021/01/13/blind-ssrf-chains/", "description": "https://blog.assetnote.io/2021/01/13/blind-ssrf-chains/"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/playground/A6/soln.py", "diff": "--- \n+++ \n@@ -1,11 +1,11 @@\n-import requests\n+from security import safe_requests\n \n def check_vuln(list_of_modules)->list:\n vulns = []\n for i in list_of_modules:\n k = i.split(\"==\")\n url = f\"https://pypi.org/pypi/{k[0]}/{k[1]}/json\"\n- response = requests.get(url)\n+ response = safe_requests.get(url)\n response.raise_for_status()\n info = response.json()\n existing_vuln = info['vulnerabilities']\n", "changes": [{"lineNumber": "8", "description": "Switch use of requests for security.safe_requests", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "introduction/playground/A6/utility.py", "diff": "--- \n+++ \n@@ -1,11 +1,11 @@\n-import requests\n+from security import safe_requests\n \n def check_vuln(list_of_modules)->list:\n vulns = []\n for i in list_of_modules:\n k = i.split(\"==\")\n url = f\"https://pypi.org/pypi/{k[0]}/{k[1]}/json\"\n- response = requests.get(url)\n+ response = safe_requests.get(url)\n response.raise_for_status()\n info = response.json()\n existing_vuln = info['vulnerabilities']\n", "changes": [{"lineNumber": "8", "description": "Switch use of requests for security.safe_requests", "properties": {}, "diffSide": "right", "packageActions": []}]}, {"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -1,11 +1,8 @@\n import hashlib\n from django.shortcuts import render,redirect\n-from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse\n-from .models import FAANG, AF_session_id,info,login,comments,authLogin, tickits, sql_lab_table,Blogs,CF_user,AF_admin\n-from django.core import serializers\n-from requests.structures import CaseInsensitiveDict\n-from django.contrib.auth import login,authenticate\n-from django.contrib.auth.forms import UserCreationForm\n+from django.http import HttpResponse, HttpResponseBadRequest\n+from .models import FAANG, AF_session_id,login,comments,authLogin, tickits, sql_lab_table,Blogs,CF_user,AF_admin\n+from django.contrib.auth import login\n import random\n import string\n import os\n@@ -15,19 +12,17 @@\n from django.contrib import messages\n #*****************************************Lab Requirements****************************************************#\n \n-from .models import FAANG,info,login,comments,otp\n+from .models import FAANG,login,comments,otp\n from random import randint\n from xml.dom.pulldom import parseString, START_ELEMENT\n from xml.sax.handler import feature_external_ges\n from xml.sax import make_parser\n from django.views.decorators.csrf import csrf_exempt\n-from django.template import loader\n from django.template.loader import render_to_string\n import subprocess\n import pickle\n import base64\n import yaml\n-import json\n from dataclasses import dataclass\n import uuid\n from .utility import filter_blog, customHash\n@@ -37,8 +32,9 @@\n from io import BytesIO\n from argon2 import PasswordHasher\n import logging\n-import requests\n import re\n+from security import safe_requests\n+\n #*****************************************Login and Registration****************************************************#\n \n def register(request):\n@@ -951,7 +947,7 @@\n elif request.method == \"POST\":\n url = request.POST[\"url\"]\n try:\n- response = requests.get(url)\n+ response = safe_requests.get(url)\n return render(request, \"Lab/ssrf/ssrf_lab2.html\", {\"response\": response.content.decode()})\n except:\n return render(request, \"Lab/ssrf/ssrf_lab2.html\", {\"error\": \"Invalid URL\"})\n", "changes": [{"lineNumber": "954", "description": "Switch use of requests for security.safe_requests", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/use-defusedxml", "summary": "Use `defusedxml` for Parsing XML", "description": "You might be surprised to learn that Python's built-in XML libraries are [considered insecure](https://docs.python.org/3/library/xml.html#xml-vulnerabilities) against various kinds of attacks.\n\nIn fact, the [Python documentation itself](https://docs.python.org/3/library/xml.html#the-defusedxml-package) recommends the use of [defusedxml](https://pypi.org/project/defusedxml/) for parsing untrusted XML data. `defusedxml` is an [open-source](https://github.com/tiran/defusedxml), permissively licensed project that is intended as a drop-in replacement for Python's standard library XML parsers.\n\nThis codemod updates all relevant uses of the standard library parsers with safe versions from `defusedxml`. It also adds the `defusedxml` dependency to your project where possible.\n\nThe changes from this codemod look like this:\n```diff\n- from xml.etree.ElementTree import parse\n+ import defusedxml.ElementTree\n\n- et = parse('data.xml')\n+ et = defusedxml.ElementTree.parse('data.xml')\n```\n\n## Dependency Updates\n\nThis codemod relies on an external dependency. However, we were unable to automatically add the dependency to your project. \n\nThis package is [recommended by the Python community](https://docs.python.org/3/library/xml.html#the-defusedxml-package) to protect against XML vulnerabilities. \n\nThere are a number of places where Python project dependencies can be expressed, including `setup.py`, `pyproject.toml`, `setup.cfg`, and `requirements.txt` files. You may need to manually add this dependency to the proper location in your project.\n\n### Manual Installation\n\nFor `setup.py`:\n```diff\n install_requires=[\n+ \"defusedxml==0.7.1\",\n ],\n```\n\nFor `pyproject.toml` (using `setuptools`):\n```diff\n [project]\n dependencies = [\n+ \"defusedxml==0.7.1\",\n ]\n```\n\nFor `setup.cfg`:\n```diff\n [options]\n install_requires =\n+ defusedxml==0.7.1\n```\n\nFor `requirements.txt`:\n```diff\n+defusedxml==0.7.1\n```\n\nFor more information on adding dependencies to `setuptools` projects, see [the setuptools documentation](https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#declaring-required-dependency). \n\nIf you are using another build system, please refer to the documentation for that system to determine how to add dependencies.\n", "references": [{"url": "https://docs.python.org/3/library/xml.html#xml-vulnerabilities", "description": "https://docs.python.org/3/library/xml.html#xml-vulnerabilities"}, {"url": "https://docs.python.org/3/library/xml.html#the-defusedxml-package", "description": "https://docs.python.org/3/library/xml.html#the-defusedxml-package"}, {"url": "https://pypi.org/project/defusedxml/", "description": "https://pypi.org/project/defusedxml/"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html", "description": "https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -17,9 +17,8 @@\n \n from .models import FAANG,info,login,comments,otp\n from random import randint\n-from xml.dom.pulldom import parseString, START_ELEMENT\n+from xml.dom.pulldom import START_ELEMENT\n from xml.sax.handler import feature_external_ges\n-from xml.sax import make_parser\n from django.views.decorators.csrf import csrf_exempt\n from django.template import loader\n from django.template.loader import render_to_string\n@@ -39,6 +38,9 @@\n import logging\n import requests\n import re\n+import defusedxml.pulldom\n+import defusedxml.sax\n+\n #*****************************************Login and Registration****************************************************#\n \n def register(request):\n@@ -247,9 +249,9 @@\n @csrf_exempt\n def xxe_parse(request):\n \n- parser = make_parser()\n+ parser = defusedxml.sax.make_parser()\n parser.setFeature(feature_external_ges, True)\n- doc = parseString(request.body.decode('utf-8'), parser=parser)\n+ doc = defusedxml.pulldom.parseString(request.body.decode('utf-8'), parser=parser)\n for event, node in doc:\n if event == START_ELEMENT and node.tagName == 'text':\n doc.expandNode(node)\n", "changes": [{"lineNumber": "250", "description": "Replace builtin XML method with safe `defusedxml` method", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "252", "description": "Replace builtin XML method with safe `defusedxml` method", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/use-generator", "summary": "Use Generator Expressions Instead of List Comprehensions", "description": "Imagine that someone handed you a pile of 100 apples and then asked you to count how many of them were green without putting any of them down. You'd probably find this quite challenging and you'd struggle to hold the pile of apples at all. Now imagine someone handed you the apples one at a time and asked you to just count the green ones. This would be a much easier task.\n\nIn Python, when we use list comprehensions, it's like we've created the entire pile of apples and asked the interpreter to hold onto it. Sometimes, a better practice involves using generator expressions, which create iterators that yield objects one at a time. For large data sets, this can turn a slow, memory intensive operation into a relatively fast one.\n\nUsing generator expressions instead of list comprehensions can lead to better performance. This is especially true for functions such as `any` where it's not always necessary to evaluate the entire list before returning. For other functions such as `max` or `sum` it means that the program does not need to store the entire list in memory. These performance effects becomes more noticeable as the sizes of the lists involved grow large.\n\nThis codemod replaces the use of a list comprehension expression with a generator expression within certain function calls. Generators allow for lazy evaluation of the iterator, which can have performance benefits.\n\nThe changes from this codemod look like this:\n```diff\n- result = sum([x for x in range(1000)])\n+ result = sum(x for x in range(1000))\n```\n", "references": [{"url": "https://pylint.readthedocs.io/en/latest/user_guide/messages/refactor/use-a-generator.html", "description": "https://pylint.readthedocs.io/en/latest/user_guide/messages/refactor/use-a-generator.html"}, {"url": "https://docs.python.org/3/glossary.html#term-generator-expression", "description": "https://docs.python.org/3/glossary.html#term-generator-expression"}, {"url": "https://docs.python.org/3/glossary.html#term-list-comprehension", "description": "https://docs.python.org/3/glossary.html#term-list-comprehension"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/use-set-literal", "summary": "Use Set Literals Instead of Sets from Lists", "description": "This codemod converts Python set constructions using literal list arguments into more efficient and readable set literals. It simplifies expressions like `set([1, 2, 3])` to `{1, 2, 3}`, enhancing both performance and code clarity.\n\nOur changes look like this:\n```diff\n-x = set([1, 2, 3])\n+x = {1, 2, 3}\n```\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/use-walrus-if", "summary": "Use Assignment Expression (Walrus) In Conditional", "description": "This codemod updates places where two separate statements involving an assignment and conditional can be replaced with a single Assignment Expression (commonly known as the walrus operator).\n\nMany developers use this operator in new code that they write but don't have the time to find and update every place in existing code. So we do it for you! We believe this leads to more concise and readable code.\n\nThe changes from this codemod look like this:\n\n```diff\n- x = foo()\n- if x is not None:\n+ if (x := foo()) is not None:\n print(x)\n```\n", "references": [{"url": "https://docs.python.org/3/whatsnew/3.8.html#assignment-expressions", "description": "https://docs.python.org/3/whatsnew/3.8.html#assignment-expressions"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -524,8 +524,7 @@\n return redirect('login')\n \n def secret(request):\n- XHost = request.headers.get('X-Host', 'None')\n- if(XHost == 'admin.localhost:8000'):\n+ if((XHost := request.headers.get('X-Host', 'None')) == 'admin.localhost:8000'):\n return render(request,\"Lab/sec_mis/sec_mis_lab.html\", {\"secret\": \"S3CR37K3Y\"})\n else:\n return render(request,\"Lab/sec_mis/sec_mis_lab.html\", {\"no_secret\": \"Only admin.localhost:8000 can access, Your X-Host is \" + XHost})\n@@ -931,9 +930,8 @@\n \n \n def ssrf_target(request):\n- x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')\n-\n- if x_forwarded_for:\n+\n+ if x_forwarded_for := request.META.get('HTTP_X_FORWARDED_FOR'):\n ip = x_forwarded_for.split(',')[0]\n else:\n ip = request.META.get('REMOTE_ADDR')\n", "changes": [{"lineNumber": "94", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "107", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "205", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "527", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "639", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "650", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "934", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "1137", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}, {"lineNumber": "1173", "description": "Replaces multiple expressions involving `if` operator with 'walrus' operator.", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/bad-lock-with-statement", "summary": "Separate Lock Instantiation from `with` Call", "description": "This codemod separates creating a threading lock instance from calling it as a context manager. Calling `with threading.Lock()` does not have the effect you would expect. The lock is not acquired. Instead, to correctly acquire a lock, create the instance separately, before calling it as a context manager.\n\nThe change will apply to any of these `threading` classes: `Lock`, `RLock`, `Condition`, `Semaphore`, and `BoundedSemaphore`.\n\nThe change looks like this:\n\n```diff\n import threading\n- with threading.Lock():\n+ lock = threading.Lock()\n+ with lock:\n ...\n```\n", "references": [{"url": "https://pylint.pycqa.org/en/latest/user_guide/messages/warning/useless-with-lock.", "description": "https://pylint.pycqa.org/en/latest/user_guide/messages/warning/useless-with-lock."}, {"url": "https://docs.python.org/3/library/threading.html#using-locks-conditions-and-semaphores-in-the-with-statement", "description": "https://docs.python.org/3/library/threading.html#using-locks-conditions-and-semaphores-in-the-with-statement"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/sql-parameterization", "summary": "Parameterize SQL Queries", "description": "This codemod refactors SQL statements to be parameterized, rather than built by hand.\n\nWithout parameterization, developers must remember to escape string inputs using the rules for that column type and database. This usually results in bugs -- and sometimes vulnerabilities. Although we can't tell for sure if your code is actually exploitable, this change will make the code more robust in case the conditions which prevent exploitation today ever go away.\n\nOur changes look something like this:\n\n```diff\nimport sqlite3\n\nname = input()\nconnection = sqlite3.connect(\"my_db.db\")\ncursor = connection.cursor()\n- cursor.execute(\"SELECT * from USERS WHERE name ='\" + name + \"'\")\n+ cursor.execute(\"SELECT * from USERS WHERE name =?\", (name, ))\n```\n", "references": [{"url": "https://cwe.mitre.org/data/definitions/89.html", "description": "https://cwe.mitre.org/data/definitions/89.html"}, {"url": "https://owasp.org/www-community/attacks/SQL_Injection", "description": "https://owasp.org/www-community/attacks/SQL_Injection"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/secure-flask-session-configuration", "summary": "Flip Insecure `Flask` Session Configurations", "description": "Flask applications can configure sessions behavior at the application level. \nThis codemod looks for Flask application configuration that set `SESSION_COOKIE_HTTPONLY`, `SESSION_COOKIE_SECURE`, or `SESSION_COOKIE_SAMESITE` to an insecure value and changes it to a secure one.\n\nThe changes from this codemod look like this:\n\n```diff\n from flask import Flask\n app = Flask(__name__)\n- app.config['SESSION_COOKIE_HTTPONLY'] = False\n- app.config.update(SESSION_COOKIE_SECURE=False)\n+ app.config['SESSION_COOKIE_HTTPONLY'] = True\n+ app.config.update(SESSION_COOKIE_SECURE=True)\n```\n", "references": [{"url": "https://owasp.org/www-community/controls/SecureCookieAttribute", "description": "https://owasp.org/www-community/controls/SecureCookieAttribute"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/Session_Management_Cheat_Sheet.html", "description": "https://cheatsheetseries.owasp.org/cheatsheets/Session_Management_Cheat_Sheet.html"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/subprocess-shell-false", "summary": "Use `shell=False` in `subprocess` Function Calls", "description": "This codemod sets the `shell` keyword argument to `False` in `subprocess` module function calls that have set it to `True`.\n\nSetting `shell=True` will execute the provided command through the system shell which can lead to shell injection vulnerabilities. In the worst case this can give an attacker the ability to run arbitrary commands on your system. In most cases using `shell=False` is sufficient and leads to much safer code.\n\nThe changes from this codemod look like this:\n\n```diff\n import subprocess\n- subprocess.run(\"echo 'hi'\", shell=True)\n+ subprocess.run(\"echo 'hi'\", shell=False)\n```\n", "references": [{"url": "https://docs.python.org/3/library/subprocess.html#security-considerations", "description": "https://docs.python.org/3/library/subprocess.html#security-considerations"}, {"url": "https://en.wikipedia.org/wiki/Code_injection#Shell_injection", "description": "https://en.wikipedia.org/wiki/Code_injection#Shell_injection"}, {"url": "https://stackoverflow.com/a/3172488", "description": "https://stackoverflow.com/a/3172488"}], "properties": {}, "failedFiles": [], "changeset": [{"path": "introduction/views.py", "diff": "--- \n+++ \n@@ -420,8 +420,7 @@\n # output=subprocess.check_output(command,shell=True,encoding=\"UTF-8\")\n process = subprocess.Popen(\n command,\n- shell=True,\n- stdout=subprocess.PIPE, \n+ shell=False, stdout=subprocess.PIPE, \n stderr=subprocess.PIPE)\n stdout, stderr = process.communicate()\n data = stdout.decode('utf-8')\n", "changes": [{"lineNumber": "421", "description": "Set `shell` keyword argument to `False`", "properties": {}, "diffSide": "right", "packageActions": []}]}]}, {"codemod": "pixee:python/fix-file-resource-leak", "summary": "Automatically Close Resources", "description": "This codemod wraps assignments of `open` calls in a with statement. Without explicit closing, these resources will be \"leaked\" and won't be re-claimed until garbage collection. In situations where these resources are leaked rapidly (either through malicious repetitive action or unusually spiky usage), connection pool or file handle exhaustion will occur. These types of failures tend to be catastrophic, resulting in downtime and many times affect downstream applications.\n\nOur changes look something like this:\n\n```diff\nimport tempfile\npath = tempfile.NamedTemporaryFile().name\n-file = open(path, 'w', encoding='utf-8')\n-file.write('Hello World')\n+with open(path, 'w', encoding='utf-8') as file:\n+ file.write('Hello World')\n```\n", "references": [{"url": "https://cwe.mitre.org/data/definitions/772.html", "description": "https://cwe.mitre.org/data/definitions/772.html"}, {"url": "https://cwe.mitre.org/data/definitions/404.html", "description": "https://cwe.mitre.org/data/definitions/404.html"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/django-receiver-on-top", "summary": "Ensure Django @receiver is the first decorator", "description": "Django uses signals to notify and handle actions that happens elsewhere in the application. You can define a response to a given signal by decorating a function with the `@receiver(signal)` decorator. The order in which the decorators are declared for this function is important. If the `@receiver` decorator is not on top, any decorators before it will be ignored. \nOur changes look something like this:\n\n```diff\nfrom django.dispatch import receiver\nfrom django.views.decorators.csrf import csrf_exempt\nfrom django.core.signals import request_finished\n\n+@receiver(request_finished)\n@csrf_exempt\n-@receiver(request_finished)\ndef foo():\n pass\n```\n", "references": [{"url": "https://docs.djangoproject.com/en/4.1/topics/signals/", "description": "https://docs.djangoproject.com/en/4.1/topics/signals/"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/numpy-nan-equality", "summary": "Replace == comparison with numpy.isnan()", "description": "Comparisons against `numpy.nan` always result in `False`. Thus comparing an expression directly against `numpy.nan` is always unintended. The correct way to compare a value for `NaN` is to use the `numpy.isnan` function.\n\nOur changes look something like this:\n\n```diff\nimport numpy as np\n\na = np.nan\n-if a == np.nan:\n+if np.isnan(a):\n pass\n```\n", "references": [{"url": "https://numpy.org/doc/stable/reference/constants.html#numpy.nan", "description": "https://numpy.org/doc/stable/reference/constants.html#numpy.nan"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/django-json-response-type", "summary": "Set content type to `application/json` for `django.http.HttpResponse` with JSON data", "description": "The default `content_type` for `HttpResponse` in Django is `'text/html'`. This is true even when the response contains JSON data.\nIf the JSON contains (unsanitized) user-supplied input, a malicious user may supply HTML code which leaves the application vulnerable to cross-site scripting (XSS). \nThis fix explicitly sets the response type to `application/json` when the response body is JSON data to avoid this vulnerability. Our changes look something like this:\n\n```diff\nfrom django.http import HttpResponse\nimport json\n\ndef foo(request):\n json_response = json.dumps({ \"user_input\": request.GET.get(\"input\") })\n- return HttpResponse(json_response)\n+ return HttpResponse(json_response, content_type=\"application/json\")\n```\n", "references": [{"url": "https://docs.djangoproject.com/en/4.0/ref/request-response/#django.http.HttpResponse.__init__", "description": "https://docs.djangoproject.com/en/4.0/ref/request-response/#django.http.HttpResponse.__init__"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#output-encoding-for-javascript-contexts", "description": "https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#output-encoding-for-javascript-contexts"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/flask-json-response-type", "summary": "Set content type to `application/json` for `flask.make_response` with JSON data", "description": "The default `mimetype` for `make_response` in Flask is `'text/html'`. This is true even when the response contains JSON data.\nIf the JSON contains (unsanitized) user-supplied input, a malicious user may supply HTML code which leaves the application vulnerable to cross-site scripting (XSS). \nThis fix explicitly sets the response type to `application/json` when the response body is JSON data to avoid this vulnerability. Our changes look something like this:\n\n```diff\nfrom flask import make_response, Flask\nimport json\n\napp = Flask(__name__)\n\n@app.route(\"/test\")\ndef foo(request):\n json_response = json.dumps({ \"user_input\": request.GET.get(\"input\") })\n- return make_response(json_response)\n+ return make_response(json_response, {'Content-Type':'application/json'})\n```\n", "references": [{"url": "https://flask.palletsprojects.com/en/2.3.x/patterns/javascript/#return-json-from-views", "description": "https://flask.palletsprojects.com/en/2.3.x/patterns/javascript/#return-json-from-views"}, {"url": "https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#output-encoding-for-javascript-contexts", "description": "https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#output-encoding-for-javascript-contexts"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/exception-without-raise", "summary": "Ensure bare exception statements are raised", "description": "This codemod fixes cases where an exception is referenced by itself in a statement without being raised. This most likely indicates a bug: you probably meant to actually raise the exception. \n\nOur changes look something like this:\n```diff\ntry:\n- ValueError\n+ raise ValueError\nexcept:\n pass\n```\n", "references": [{"url": "https://docs.python.org/3/tutorial/errors.html#raising-exceptions", "description": "https://docs.python.org/3/tutorial/errors.html#raising-exceptions"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/literal-or-new-object-identity", "summary": "Replace `is` with `==` for literal or new object comparisons", "description": "The `is` and `is not` operators only evaluate to `True` when the expressions on each side have the same `id`. In other words, `a is b` is equivalent to `id(a) == id(b)`. With few exceptions, objects and literals have unique identities and thus shouldn't generally be compared by using the `is` or `is not` operators.\n\nOur changes look something like this:\n\n```diff\ndef foo(l):\n- return l is [1,2,3]\n+ return l == [1,2,3]\n```\n", "references": [{"url": "https://docs.python.org/3/library/stdtypes.html#comparisons", "description": "https://docs.python.org/3/library/stdtypes.html#comparisons"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/remove-module-global", "summary": "Remove `global` Usage at Module Level", "description": "Using the `global` keyword is necessary only when you intend to modify a module-level (aka global) variable within a non-global scope, such as within a class or function. It is unnecessary to call `global` at the module-level.\n\nOur changes look something like this:\n\n```diff\n price = 25\n print(\"hello\")\n- global price\n price = 30\n```\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/remove-debug-breakpoint", "summary": "Remove Calls to `builtin` `breakpoint` and `pdb.set_trace", "description": "This codemod removes any calls to `breakpoint()` or `pdb.set_trace()` which are generally only used for interactive debugging and should not be deployed in production code.\n\nIn most cases if these calls are included in committed code, they were left there by mistake and indicate a potential problem.\n\n```diff\n print(\"hello\")\n- breakpoint()\n print(\"world\")\n```\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/combine-startswith-endswith", "summary": "Simplify Boolean Expressions Using `startswith` and `endswith`", "description": "Many developers are not necessarily aware that the `startswith` and `endswith` methods of `str` objects can accept a tuple of strings to match. This means that there is a lot of code that uses boolean expressions such as `x.startswith('foo') or x.startswith('bar')` instead of the simpler expression `x.startswith(('foo', 'bar'))`.\n\nThis codemod simplifies the boolean expressions where possible which leads to cleaner and more concise code.\n\nThe changes from this codemod look like this:\n\n```diff\n x = 'foo'\n- if x.startswith(\"foo\") or x.startswith(\"bar\"):\n+ if x.startswith((\"foo\", \"bar\")):\n ...\n```\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/fix-deprecated-logging-warn", "summary": "Replace Deprecated `logging.warn`", "description": "The `warn` method from `logging` has been [deprecated](https://docs.python.org/3/library/logging.html#logging.Logger.warning) in favor of `warning` since Python 3.3. Since the old method `warn` has been retained for a long time, there are a lot of developers that are unaware of this change and consequently a lot of code using the older method.\n\nOur changes look like the following:\n```diff\n import logging\n\n- logging.warn(\"hello\")\n+ logging.warning(\"hello\")\n ...\n log = logging.getLogger(\"my logger\")\n- log.warn(\"hello\")\n+ log.warning(\"hello\") \n```\n", "references": [{"url": "https://docs.python.org/3/library/logging.html#logging.Logger.warning", "description": "https://docs.python.org/3/library/logging.html#logging.Logger.warning"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/flask-enable-csrf-protection", "summary": "Enable CSRF protection globally for a Flask app.", "description": "Cross-site request forgery (CSRF) is an attack where a user is tricked by a malicious agent to submit a unintended request (e.g login requests). A common way to mitigate this issue is to embed an additional token into requests to identify requests from unauthorized locations.\n\nFlask views using `FlaskForm` have CSRF protection enabled by default. However other views may use AJAX to perform unsafe HTTP methods. FlaskWTF provides a way to enable CSRF protection globally for all views of a Flask app.\n\nThe changes in this codemod may require manual additions to maintain proper functionality. You need to setup either a flask `SECRET_KEY` or a `WTF_CSRF_SECRET_KEY` in you app configuration and adjust any views with HTML forms and javascript requests to include the CSRF token. See the [FlaskWTF docs](https://flask-wtf.readthedocs.io/en/1.2.x/csrf/) for examples on how to do it.\n\nOur changes look something like this:\n\n```diff\nfrom flask import Flask\n+from flask_wtf.csrf import CSRFProtect\n\napp = Flask(__name__)\n+csrf_app = CSRFProtect(app)\n```\n", "references": [{"url": "https://owasp.org/www-community/attacks/csrf", "description": "https://owasp.org/www-community/attacks/csrf"}, {"url": "https://flask-wtf.readthedocs.io/en/1.2.x/csrf/", "description": "https://flask-wtf.readthedocs.io/en/1.2.x/csrf/"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/replace-flask-send-file", "summary": "Replace unsafe usage of `flask.send_file`", "description": "The `Flask` `send_file` function from Flask is susceptible to a path traversal attack if its input is not properly validated.\nIn a path traversal attack, the malicious agent can craft a path containing special paths like `./` or `../` to resolve a file outside of the expected directory path. This potentially allows the agent to overwrite, delete or read arbitrary files. In the case of `flask.send_file`, the result is that a malicious user could potentially download sensitive files that exist on the filesystem where the application is being hosted.\nFlask offers a native solution with the `flask.send_from_directory` function that validates the given path.\n\nOur changes look something like this:\n\n```diff\n-from flask import Flask, send_file\n+from flask import Flask\n+import flask\n+from pathlib import Path\n\napp = Flask(__name__)\n\n@app.route(\"/uploads/\")\ndef download_file(name):\n- return send_file(f'path/to/{name}.txt')\n+ return flask.send_from_directory((p := Path(f'path/to/{name}.txt')).parent, p.name)\n```\n", "references": [{"url": "https://flask.palletsprojects.com/en/3.0.x/api/#flask.send_from_directory", "description": "https://flask.palletsprojects.com/en/3.0.x/api/#flask.send_from_directory"}, {"url": "https://owasp.org/www-community/attacks/Path_Traversal", "description": "https://owasp.org/www-community/attacks/Path_Traversal"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/remove-assertion-in-pytest-raises", "summary": "Moves assertions out of `pytest.raises` scope", "description": "The context manager object `pytest.raises()` will assert if the code contained within its scope will raise an exception of type ``. The documentation points that the exception must be raised in the last line of its scope and any line afterwards won't be executed. \nIncluding asserts at the end of the scope is a common error. This codemod addresses that by moving them out of the scope.\nOur changes look something like this:\n\n```diff\nimport pytest\n\ndef test_foo():\n with pytest.raises(ZeroDivisionError):\n error = 1/0\n- assert 1\n- assert 2\n+ assert 1\n+ assert 2\n```\n", "references": [{"url": "https://docs.pytest.org/en/7.4.x/reference/reference.html#pytest-raises", "description": "https://docs.pytest.org/en/7.4.x/reference/reference.html#pytest-raises"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/fix-assert-tuple", "summary": "Fix `assert` on Non-Empty Tuple Literal", "description": "An assertion on a non-empty tuple will always evaluate to `True`. This means that `assert` statements involving non-empty tuple literals are likely unintentional and should be rewritten. This codemod rewrites the original `assert` statement by creating a new `assert` for each item in the original tuple.\n\nThe changes from this codemod look like this:\n\n```diff\n- assert (1 == 1, 2 == 2)\n+ assert 1 == 1\n+ assert 2 == 2\n```\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/lazy-logging", "summary": "Convert Eager Logging to Lazy Logging", "description": "This codemod converts \"eager\" logging into \"lazy\" logging, which is preferred for performance efficiency and resource optimization.\nLazy logging defers the actual construction and formatting of log messages until it's confirmed that the message will be logged based on the current log level, thereby avoiding unnecessary computation for messages that will not be logged. \n\nOur changes look something like this:\n\n```diff\nimport logging\ne = \"Some error\"\n- logging.error(\"Error occurred: %s\" % e)\n- logging.error(\"Error occurred: \" + e)\n+ logging.error(\"Error occurred: %s\", e)\n+ logging.error(\"Error occurred: %s\", e)\n```\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/str-concat-in-sequence-literals", "summary": "Convert Implicit String Concat Inside Sequence into Individual Elements", "description": "This codemod fixes cases of implicit string concatenation inside lists, sets, or tuples. This is most likely a mistake: you probably meant include a comma in between the concatenated strings. \n\nOur changes look something like this:\n```diff\nbad = [\n- \"ab\"\n+ \"ab\",\n \"cd\",\n \"ef\",\n- \"gh\"\n+ \"gh\",\n \"ij\",\n]\n```\n", "references": [], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/fix-async-task-instantiation", "summary": "Use High-Level `asyncio` API Functions to Create Tasks", "description": "The `asyncio` [documentation](https://docs.python.org/3/library/asyncio-task.html#asyncio.Task) explicitly discourages manual instantiation of a `Task` instance and instead recommends calling `create_task`. This keeps your code in line with recommended best practices and promotes maintainability.\n\nOur changes look like the following:\n```diff\n import asyncio\n\n- task = asyncio.Task(my_coroutine(), name=\"my task\")\n+ task = asyncio.create_task(my_coroutine(), name=\"my task\")\n```\n", "references": [{"url": "https://docs.python.org/3/library/asyncio-task.html#asyncio.Task", "description": "https://docs.python.org/3/library/asyncio-task.html#asyncio.Task"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/django-model-without-dunder-str", "summary": "Ensure Django Model Classes Implement a `__str__` Method", "description": "If you've ever actively developed or debugged a Django application, you may have noticed that the string representations of Django models and their instances can sometimes be hard to read or to distinguish from one another. Loading models in the interactive Django console or viewing them in the admin interface can be puzzling. This is because the default string representation of Django models is fairly generic.\n\nThis codemod is intended to make the string representation of your model objects more human-readable. It will automatically detect all of your model's fields and display them as a descriptive string.\n\nFor example, the default string representation of the `Question` model from Django's popular Poll App tutorial looks like this:\n```diff\nfrom django.db import models\n\nclass Question(models.Model):\n question_text = models.CharField(max_length=200)\n pub_date = models.DateTimeField(\"date published\")\n+ \n+ def __str__(self):\n+ model_name = self.__class__.__name__\n+ fields_str = \", \".join((f\"{field.name}={getattr(self, field.name)}\" for field in self._meta.fields))\n+ return f\"{model_name}({fields_str})\"\n```\n\nWithout this change, the string representation of `Question` objects look like this in the interactive Django shell:\n```\n>>> Question.objects.all()\n]>\n```\nWith this codemod's addition of `__str__`, it now looks like:\n```\n>>> Question.objects.all()\n]>\n```\n\nYou'll notice this change works great for models with only a handful of fields. We encourage you to use this codemod's change as a starting point for further customization.\n", "references": [{"url": "https://docs.djangoproject.com/en/5.0/ref/models/instances/#django.db.models.Model.__str__", "description": "https://docs.djangoproject.com/en/5.0/ref/models/instances/#django.db.models.Model.__str__"}], "properties": {}, "failedFiles": [], "changeset": []}, {"codemod": "pixee:python/fix-hasattr-call", "summary": "Use `callable` builtin to check for callables", "description": "This codemod fixes cases where `hasattr` is used to check if an object is a callable. You likely want to use `callable` instead. This is because using `hasattr` will return different results in some cases, such as when the class implements a `__getattr__` method. \n\nOur changes look something like this:\n```diff\n class Test:\n pass\n\n obj = Test()\n- hasattr(obj, \"__call__\")\n+ callable(obj)\n```\n", "references": [{"url": "https://docs.python.org/3/library/functions.html#callable", "description": "https://docs.python.org/3/library/functions.html#callable"}, {"url": "https://docs.python.org/3/library/functions.html#hasattr", "description": "https://docs.python.org/3/library/functions.html#hasattr"}], "properties": {}, "failedFiles": [], "changeset": []}]} \ No newline at end of file diff --git a/examples/webgoat.codetf.json b/examples/webgoat.codetf.json new file mode 100644 index 0000000..e7cf3b8 --- /dev/null +++ b/examples/webgoat.codetf.json @@ -0,0 +1 @@ +{"run":{"vendor":"io.codemodder","tool":"codemodder","version":"1.0.0","commandLine":"--codemod-include pixee:java/harden-xmlinputfactory,pixee:java/harden-zip-entry-paths,pixee:java/encode-jsp-scriptlet,pixee:java/fix-verb-tampering,pixee:java/secure-random,pixee:java/sql-parameterizer,pixee:java/limit-readline,pixee:java/validate-jakarta-forward-path,pixee:java/upgrade-sslengine-tls,pixee:java/upgrade-sslparameters-tls,pixee:java/upgrade-sslsocket-tls,pixee:java/upgrade-sslcontext-tls,pixee:java/harden-process-creation,pixee:java/make-prng-seed-unpredictable,pixee:java/harden-xmldecoder-stream,pixee:java/sandbox-url-creation,pixee:java/sanitize-apache-multipart-filename,pixee:java/sanitize-spring-multipart-filename,pixee:java/strip-http-header-newlines,pixee:java/harden-xstream,codeql:java/missing-jwt-signature-check,codeql:java/database-resource-leak,codeql:java/stack-trace-exposure,codeql:java/insecure-cookie,codeql:java/output-resource-leak,pixee:java/upgrade-tempfile-to-nio,pixee:java/switch-literal-first,pixee:java/prevent-filewriter-leak-with-nio,pixee:java/hql-parameterizer,pixee:java/disable-dircontext-deserialization,pixee:java/move-switch-default-last,pixee:java/verbose-request-mapping,pixee:java/add-clarifying-braces,semgrep:java/java.lang.security.audit.overly-permissive-file-permission.overly-permissive-file-permission,sonar:java/harden-string-parse-to-primitives-s2130,sonar:java/overrides-match-synchronization-s3551,sonar:java/remove-redundant-variable-creation-s1488,sonar:java/simplify-rest-controller-annotations-s6833,sonar:java/remove-commented-code-s125,sonar:java/remove-unused-private-method-s1144,sonar:java/declare-variable-on-separate-line-s1659,sonar:java/remove-unused-local-variable-s1481,sonar:java/define-constant-for-duplicate-literal-s1192,sonar:java/remove-useless-parentheses-s1110,sonar:java/avoid-implicit-public-constructor-s1118,sonar:java/replace-stream-collectors-to-list-s6204,sonar:java/add-missing-override-s1161,sonar:java/substitute-replaceAll-s5361,sonar:java/remove-redundant-static-s2786 --output-format codetf --output /mnt/code-workspaces/workspace-11795311773268099153/workspace/results/results.codetf.json /mnt/code-workspaces/workspace-11795311773268099153/workspace","elapsed":579153,"directory":"/mnt/code-workspaces/workspace-11795311773268099153/workspace","sarifs":[]},"results":[{"codemod":"pixee:java/harden-process-creation","summary":"Introduced protections against system command injection","description":"This change hardens all instances of [Runtime#exec()](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Runtime.html) to offer protection against attack.\n\nLeft unchecked, `Runtime#exec()` can execute any arbitrary system command. If an attacker can control part of the strings used to as program paths or arguments, they could execute arbitrary programs, install malware, and anything else they could do if they had a shell open on the application host.\n\nOur change introduces a sandbox which protects the application:\n\n```diff\n+ import io.github.pixee.security.SystemCommand;\n ...\n- Process p = Runtime.getRuntime().exec(command);\n+ Process p = SystemCommand.runCommand(Runtime.getRuntime(), command);\n```\n\nThe default restrictions applied are the following:\n* **Prevent command chaining**. Many exploits work by injecting command separators and causing the shell to interpret a second, malicious command. The `SystemCommand#runCommand()` attempts to parse the given command, and throw a `SecurityException` if multiple commands are present.\n* **Prevent arguments targeting sensitive files.** There is little reason for custom code to target sensitive system files like `/etc/passwd`, so the sandbox prevents arguments that point to these files that may be targets for exfiltration.\n\nThere are [more options for sandboxing](https://github.com/pixee/java-security-toolkit/blob/main/src/main/java/io/github/pixee/security/SystemCommand.java#L15) if you are interested in locking down system commands even more.\n","failedFiles":[],"references":[{"url":"https://cheatsheetseries.owasp.org/cheatsheets/OS_Command_Injection_Defense_Cheat_Sheet.html","description":"https://cheatsheetseries.owasp.org/cheatsheets/OS_Command_Injection_Defense_Cheat_Sheet.html"},{"url":"https://wiki.sei.cmu.edu/confluence/display/java/IDS07-J.+Sanitize+untrusted+data+passed+to+the+Runtime.exec%28%29+method","description":"https://wiki.sei.cmu.edu/confluence/display/java/IDS07-J.+Sanitize+untrusted+data+passed+to+the+Runtime.exec%28%29+method"}],"properties":{},"changeset":[{"path":"src/main/java/org/dummy/insecure/framework/VulnerableTaskHolder.java","diff":"--- VulnerableTaskHolder.java\n+++ VulnerableTaskHolder.java\n@@ -1,5 +1,6 @@\n package org.dummy.insecure.framework;\n \n+import io.github.pixee.security.SystemCommand;\n import java.io.BufferedReader;\n import java.io.IOException;\n import java.io.InputStreamReader;\n@@ -62,7 +63,7 @@\n && taskAction.length() < 22) {\n log.info(\"about to execute: {}\", taskAction);\n try {\n- Process p = Runtime.getRuntime().exec(taskAction);\n+ Process p = SystemCommand.runCommand(Runtime.getRuntime(), taskAction);\n BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));\n String line = null;\n while ((line = in.readLine()) != null) {","changes":[{"lineNumber":65,"properties":{},"description":"Hardened this system call to make it resistant to injected commands and commands that target sensitive files","diffSide":"left","packageActions":[{"action":"ADD","result":"COMPLETED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]},{"path":"pom.xml","diff":"--- pom.xml\n+++ pom.xml\n@@ -149,6 +149,7 @@\n 1.4.5\n \n 1.8.0\n+ 1.1.2\n \n \n \n@@ -267,6 +268,11 @@\n jruby\n 9.4.3.0\n \n+ \n+ io.github.pixee\n+ java-security-toolkit\n+ ${versions.java-security-toolkit}\n+ \n \n \n \n@@ -444,6 +450,10 @@\n spring-boot-properties-migrator\n runtime\n \n+ \n+ io.github.pixee\n+ java-security-toolkit\n+ \n \n \n ","changes":[{"lineNumber":447,"properties":{"contextual_description":"true"},"description":"This library holds security tools for protecting Java API calls.\n\nLicense: MIT ✅ | [Open source](https://github.com/pixee/java-security-toolkit) ✅ | [More facts](https://mvnrepository.com/artifact/io.github.pixee/java-security-toolkit/1.1.2)\n","diffSide":"right","packageActions":[],"parameters":[]}]}]},{"codemod":"pixee:java/harden-xmlinputfactory","summary":"Introduced protections against XXE attacks","description":"This change updates all instances of [XMLInputFactory](https://docs.oracle.com/javase/8/docs/api/javax/xml/stream/XMLInputFactory.html) to prevent them from resolving external entities, which can protect you from arbitrary code execution, sensitive data exfiltration, and probably a bunch more evil things attackers are still discovering.\n\nWithout this protection, attackers can cause your `XMLInputFactory` parser to retrieve sensitive information with attacks like this:\n\n```xml\n\n ]>\n\n &xxe;\n\n```\n\nYes, it's pretty insane that this is the default behavior. Our change hardens the factories created with the necessary security features to prevent your parser from resolving external entities.\n\n```diff\n+ import io.github.pixee.security.XMLInputFactorySecurity;\n ...\n- XMLInputFactory xmlInputFactory = XMLInputFactory.newFactory();\n+ XMLInputFactory xmlInputFactory = XMLInputFactorySecurity.hardenFactory(XMLInputFactory.newFactory());\n```\n\nYou could take our protections one step further by changing our supplied code to prevent the user from supplying a `DOCTYPE`, which is more aggressive and more secure, but also more likely to affect existing code behavior:\n```diff\n+ import io.github.pixee.security.XMLInputFactorySecurity;\n+ import io.github.pixee.security.XMLRestrictions;\n ...\n XMLInputFactory xmlInputFactory = XMLInputFactorySecurity.hardenFactory(XMLInputFactory.newFactory(), XMLRestrictions.DISALLOW_DOCTYPE);\n```\n","failedFiles":[],"references":[{"url":"https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html","description":"https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html"},{"url":"https://owasp.org/www-community/vulnerabilities/XML_External_Entity_(XXE)_Processing","description":"https://owasp.org/www-community/vulnerabilities/XML_External_Entity_(XXE)_Processing"},{"url":"https://github.com/swisskyrepo/PayloadsAllTheThings/blob/master/XXE%20Injection/README.md","description":"https://github.com/swisskyrepo/PayloadsAllTheThings/blob/master/XXE%20Injection/README.md"}],"properties":{},"changeset":[{"path":"src/main/java/org/owasp/webgoat/lessons/xxe/CommentsCache.java","diff":"--- CommentsCache.java\n+++ CommentsCache.java\n@@ -22,6 +22,7 @@\n \n package org.owasp.webgoat.lessons.xxe;\n \n+import static io.github.pixee.security.XMLInputFactorySecurity.hardenFactory;\n import static java.util.Optional.empty;\n import static java.util.Optional.of;\n \n@@ -95,7 +96,7 @@\n */\n protected Comment parseXml(String xml) throws XMLStreamException, JAXBException {\n var jc = JAXBContext.newInstance(Comment.class);\n- var xif = XMLInputFactory.newInstance();\n+ var xif = hardenFactory(XMLInputFactory.newInstance());\n \n if (webSession.isSecurityEnabled()) {\n xif.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, \"\"); // Compliant","changes":[{"lineNumber":98,"properties":{},"description":"Hardened the XML processor to prevent external entities from being resolved, which can prevent data exfiltration and arbitrary code execution","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]}]},{"codemod":"pixee:java/harden-xstream","summary":"Hardened XStream with a converter to prevent exploitation","description":"This change hardens usage of the `XStream` library to prevent remote code execution attacks.\n\nXStream is a very flexible library, but it has a history of serious vulnerabilities when handling untrusted data because it was never intended for that use case. There are some fundamental issues with the design that make it difficult to make safe when using it by default.\n\nOur change hardens new instances of `XStream` so that they can't deserialize types that are commonly used in exploits (and never in normal usage) and it looks like this:\n\n```diff\n+ import io.github.pixee.security.xstream.HardeningConverter;\n XStream xstream = new XStream();\n+ xstream.registerConverter(new HardeningConverter());\n return (AcmeObject)xstream.fromXML(xml);\n```\n\nLooking at the [history of exploits](https://x-stream.github.io/security.html#CVEs) shows that this change will either stop most exploits or raise the bar of exploitation. If you believe there should be more types added to the denylist, please [fill out a ticket](https://github.com/pixee/java-security-toolkit/issues/new) with your suggestions.\n","failedFiles":[],"references":[{"url":"https://x-stream.github.io/security.html","description":"https://x-stream.github.io/security.html"},{"url":"http://diniscruz.blogspot.com/2013/12/xstream-remote-code-execution-exploit.html","description":"http://diniscruz.blogspot.com/2013/12/xstream-remote-code-execution-exploit.html"},{"url":"https://www.contrastsecurity.com/security-influencers/serialization-must-die-act-2-xstream","description":"https://www.contrastsecurity.com/security-influencers/serialization-must-die-act-2-xstream"},{"url":"https://x-stream.github.io/CVE-2013-7285.html","description":"https://x-stream.github.io/CVE-2013-7285.html"}],"properties":{},"changeset":[{"path":"src/main/java/org/owasp/webgoat/lessons/vulnerablecomponents/VulnerableComponentsLesson.java","diff":"--- VulnerableComponentsLesson.java\n+++ VulnerableComponentsLesson.java\n@@ -23,6 +23,7 @@\n package org.owasp.webgoat.lessons.vulnerablecomponents;\n \n import com.thoughtworks.xstream.XStream;\n+import io.github.pixee.security.xstream.HardeningConverter;\n import org.apache.commons.lang3.StringUtils;\n import org.owasp.webgoat.container.assignments.AssignmentEndpoint;\n import org.owasp.webgoat.container.assignments.AssignmentHints;\n@@ -39,6 +40,7 @@\n @PostMapping(\"/VulnerableComponents/attack1\")\n public @ResponseBody AttackResult completed(@RequestParam String payload) {\n XStream xstream = new XStream();\n+ xstream.registerConverter(new HardeningConverter());\n xstream.setClassLoader(Contact.class.getClassLoader());\n xstream.alias(\"contact\", ContactImpl.class);\n xstream.ignoreUnknownElements();","changes":[{"lineNumber":41,"properties":{},"description":"Added an XStream [Converter](https://x-stream.github.io/converter-tutorial.html) which prevents common exploits","diffSide":"left","packageActions":[{"action":"ADD","result":"COMPLETED","package":"pkg:maven/io.github.pixee/java-security-toolkit-xstream@1.0.2"}],"parameters":[]}]},{"path":"pom.xml","diff":"--- pom.xml\n+++ pom.xml\n@@ -150,6 +150,7 @@\n \n 1.8.0\n 1.1.2\n+ 1.0.2\n \n \n \n@@ -273,6 +274,11 @@\n java-security-toolkit\n ${versions.java-security-toolkit}\n \n+ \n+ io.github.pixee\n+ java-security-toolkit-xstream\n+ ${versions.java-security-toolkit-xstream}\n+ \n \n \n \n@@ -454,6 +460,10 @@\n io.github.pixee\n java-security-toolkit\n \n+ \n+ io.github.pixee\n+ java-security-toolkit-xstream\n+ \n \n \n ","changes":[{"lineNumber":457,"properties":{"contextual_description":"true"},"description":"This library holds security APIs for hardening XStream operations.\n\nLicense: MIT ✅ | [Open source](https://github.com/pixee/java-security-toolkit-xstream) ✅ | No transitive dependencies ✅ | [More facts](https://mvnrepository.com/artifact/io.github.pixee/java-security-toolkit-xstream/1.0.2)\n","diffSide":"right","packageActions":[],"parameters":[]}]}]},{"codemod":"pixee:java/limit-readline","summary":"Protect `readLine()` against DoS","description":"This change hardens all [`BufferedReader#readLine()`](https://docs.oracle.com/javase/8/docs/api/java/io/BufferedReader.html#readLine--) operations against memory exhaustion.\n\nThere is no way to call `readLine()` safely since it is, by its nature, a read that must be terminated by the stream provider. Furthermore, a stream of data provided by an untrusted source could lead to a denial of service attack, as attackers can provide an infinite stream of bytes until the process runs out of memory.\n\nFixing it is straightforward using an API which limits the amount of expected characters to some sane limit. This is what our changes look like:\n\n```diff\n+ import io.github.pixee.security.BoundedLineReader;\n ...\n BufferedReader reader = getReader();\n- String line = reader.readLine(); // unlimited read, can lead to DoS\n+ String line = BoundedLineReader.readLine(reader, 5_000_000); // limited to 5MB\n```\n","failedFiles":[],"references":[{"url":"https://vulncat.fortify.com/en/detail?id=desc.dataflow.abap.denial_of_service","description":"https://vulncat.fortify.com/en/detail?id=desc.dataflow.abap.denial_of_service"},{"url":"https://cwe.mitre.org/data/definitions/400.html","description":"https://cwe.mitre.org/data/definitions/400.html"}],"properties":{},"changeset":[{"path":"src/main/java/org/dummy/insecure/framework/VulnerableTaskHolder.java","diff":"--- VulnerableTaskHolder.java\n+++ VulnerableTaskHolder.java\n@@ -1,5 +1,6 @@\n package org.dummy.insecure.framework;\n \n+import io.github.pixee.security.BoundedLineReader;\n import io.github.pixee.security.SystemCommand;\n import java.io.BufferedReader;\n import java.io.IOException;\n@@ -66,7 +67,7 @@\n Process p = SystemCommand.runCommand(Runtime.getRuntime(), taskAction);\n BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));\n String line = null;\n- while ((line = in.readLine()) != null) {\n+ while ((line = BoundedLineReader.readLine(in, 5_000_000)) != null) {\n log.info(line);\n }\n } catch (IOException e) {","changes":[{"lineNumber":69,"properties":{},"description":"Replaced with a call that offers an upper bound on the number of characters that will be read before giving up and throwing a security exception","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]}]},{"codemod":"pixee:java/sanitize-spring-multipart-filename","summary":"Sanitized user-provided file names in HTTP multipart uploads","description":"This change hardens usage of the [Spring Web](https://github.com/spring-projects/spring-framework) multipart request and file uploading feature to prevent file overwrite attacks.\n\nAlthough end users uploading a file through the browser can't fully control the file name, attackers armed with HTTP proxies, scripts or `curl` could manipulate the file to contain directory escape sequences and send in values like `../../../../../etc/passwd`. This is a common place that developers forget to distrust user input and end up including the attacker's file name in the path they end up writing.\n\nOur change sanitizes the output of `FileItem#getName()`, stripping the value of null bytes and directory escape sequences, leaving a simple file name in the expected form. The code change is very simple and looks like this:\n\n```diff\n+ import io.github.pixee.security.Filenames;\n ...\n MultipartFile uploadedFile = parseFile(request);\n- String name = uploadedFile.getOriginalFilename(); // vulnerable\n+ String name = Filenames.toSimpleFileName(uploadedFile.getOriginalFilename()); // safe\n writeFile(new File(\"my_upload_dir\", name));\n```\n","failedFiles":[],"references":[{"url":"https://owasp.org/www-community/vulnerabilities/Unrestricted_File_Upload","description":"https://owasp.org/www-community/vulnerabilities/Unrestricted_File_Upload"},{"url":"https://portswigger.net/web-security/file-upload","description":"https://portswigger.net/web-security/file-upload"},{"url":"https://github.com/spring-projects/spring-framework/blob/c989470f94926ee5c7474bead278b00e9aaac787/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java#L68","description":"https://github.com/spring-projects/spring-framework/blob/c989470f94926ee5c7474bead278b00e9aaac787/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java#L68"}],"properties":{},"changeset":[{"path":"src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRemoveUserInput.java","diff":"--- ProfileUploadRemoveUserInput.java\n+++ ProfileUploadRemoveUserInput.java\n@@ -1,5 +1,6 @@\n package org.owasp.webgoat.lessons.pathtraversal;\n \n+import io.github.pixee.security.Filenames;\n import static org.springframework.http.MediaType.ALL_VALUE;\n import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;\n \n@@ -33,6 +34,6 @@\n @ResponseBody\n public AttackResult uploadFileHandler(\n @RequestParam(\"uploadedFileRemoveUserInput\") MultipartFile file) {\n- return super.execute(file, file.getOriginalFilename());\n+ return super.execute(file, Filenames.toSimpleFileName(file.getOriginalFilename()));\n }\n }","changes":[{"lineNumber":36,"properties":{},"description":"Wrapped the file name with a sanitizer call that takes out path escaping characters","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileZipSlip.java","diff":"--- ProfileZipSlip.java\n+++ ProfileZipSlip.java\n@@ -1,5 +1,6 @@\n package org.owasp.webgoat.lessons.pathtraversal;\n \n+import io.github.pixee.security.Filenames;\n import static org.springframework.http.MediaType.ALL_VALUE;\n import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;\n \n@@ -49,7 +50,7 @@\n produces = APPLICATION_JSON_VALUE)\n @ResponseBody\n public AttackResult uploadFileHandler(@RequestParam(\"uploadedFileZipSlip\") MultipartFile file) {\n- if (!file.getOriginalFilename().toLowerCase().endsWith(\".zip\")) {\n+ if (!Filenames.toSimpleFileName(file.getOriginalFilename()).toLowerCase().endsWith(\".zip\")) {\n return failed(this).feedback(\"path-traversal-zip-slip.no-zip\").build();\n } else {\n return processZipUpload(file);\n@@ -63,7 +64,7 @@\n var currentImage = getProfilePictureAsBase64();\n \n try {\n- var uploadedZipFile = tmpZipDirectory.resolve(file.getOriginalFilename());\n+ var uploadedZipFile = tmpZipDirectory.resolve(Filenames.toSimpleFileName(file.getOriginalFilename()));\n FileCopyUtils.copy(file.getBytes(), uploadedZipFile.toFile());\n \n ZipFile zip = new ZipFile(uploadedZipFile.toFile());","changes":[{"lineNumber":52,"properties":{},"description":"Wrapped the file name with a sanitizer call that takes out path escaping characters","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]},{"lineNumber":66,"properties":{},"description":"Wrapped the file name with a sanitizer call that takes out path escaping characters","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/webwolf/FileServer.java","diff":"--- FileServer.java\n+++ FileServer.java\n@@ -22,6 +22,7 @@\n \n package org.owasp.webgoat.webwolf;\n \n+import io.github.pixee.security.Filenames;\n import static java.util.Comparator.comparing;\n import static org.springframework.http.MediaType.ALL_VALUE;\n \n@@ -86,8 +87,8 @@\n String username = authentication.getName();\n var destinationDir = new File(fileLocation, username);\n destinationDir.mkdirs();\n- myFile.transferTo(new File(destinationDir, myFile.getOriginalFilename()));\n- log.debug(\"File saved to {}\", new File(destinationDir, myFile.getOriginalFilename()));\n+ myFile.transferTo(new File(destinationDir, Filenames.toSimpleFileName(myFile.getOriginalFilename())));\n+ log.debug(\"File saved to {}\", new File(destinationDir, Filenames.toSimpleFileName(myFile.getOriginalFilename())));\n \n return new ModelAndView(\n new RedirectView(\"files\", true),","changes":[{"lineNumber":89,"properties":{},"description":"Wrapped the file name with a sanitizer call that takes out path escaping characters","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]},{"lineNumber":90,"properties":{},"description":"Wrapped the file name with a sanitizer call that takes out path escaping characters","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]}]},{"codemod":"pixee:java/sql-parameterizer","summary":"Refactored to use parameterized SQL APIs","description":"This change refactors SQL statements to be parameterized, rather than built by hand.\n\nWithout parameterization, developers must remember to escape inputs using the rules for that database. It's usually buggy, at the least -- and sometimes vulnerable.\n\nOur changes look something like this:\n\n```diff\n- Statement stmt = connection.createStatement();\n- ResultSet rs = stmt.executeQuery(\"SELECT * FROM users WHERE name = '\" + user + \"'\");\n+ PreparedStatement stmt = connection.prepareStatement(\"SELECT * FROM users WHERE name = ?\");\n+ stmt.setString(1, user);\n+ ResultSet rs = stmt.executeQuery();\n```\n","failedFiles":[],"references":[{"url":"https://cheatsheetseries.owasp.org/cheatsheets/SQL_Injection_Prevention_Cheat_Sheet.html","description":"https://cheatsheetseries.owasp.org/cheatsheets/SQL_Injection_Prevention_Cheat_Sheet.html"},{"url":"https://cwe.mitre.org/data/definitions/89.html","description":"https://cwe.mitre.org/data/definitions/89.html"}],"properties":{},"changeset":[{"path":"src/main/java/org/owasp/webgoat/lessons/sqlinjection/advanced/SqlInjectionChallenge.java","diff":"--- SqlInjectionChallenge.java\n+++ SqlInjectionChallenge.java\n@@ -23,6 +23,7 @@\n package org.owasp.webgoat.lessons.sqlinjection.advanced;\n \n import java.sql.*;\n+import java.sql.PreparedStatement;\n import lombok.extern.slf4j.Slf4j;\n import org.owasp.webgoat.container.LessonDataSource;\n import org.owasp.webgoat.container.assignments.AssignmentEndpoint;\n@@ -64,9 +65,10 @@\n \n try (Connection connection = dataSource.getConnection()) {\n String checkUserQuery =\n- \"select userid from sql_challenge_users where userid = '\" + username_reg + \"'\";\n- Statement statement = connection.createStatement();\n- ResultSet resultSet = statement.executeQuery(checkUserQuery);\n+ \"select userid from sql_challenge_users where userid = ?\";\n+ PreparedStatement statement = connection.prepareStatement(checkUserQuery);\n+ statement.setString(1, username_reg);\n+ ResultSet resultSet = statement.execute();\n \n if (resultSet.next()) {\n if (username_reg.contains(\"tom'\")) {","changes":[{"lineNumber":69,"properties":{},"description":"Parameterized SQL usage to prevent any bugs or vulnerabilities","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson8.java","diff":"--- SqlInjectionLesson8.java\n+++ SqlInjectionLesson8.java\n@@ -22,6 +22,7 @@\n \n package org.owasp.webgoat.lessons.sqlinjection.introduction;\n \n+import java.sql.PreparedStatement;\n import static java.sql.ResultSet.CONCUR_UPDATABLE;\n import static java.sql.ResultSet.TYPE_SCROLL_SENSITIVE;\n \n@@ -148,14 +149,15 @@\n action = action.replace('\\'', '\"');\n Calendar cal = Calendar.getInstance();\n SimpleDateFormat sdf = new SimpleDateFormat(\"yyyy-MM-dd HH:mm:ss\");\n- String time = sdf.format(cal.getTime());\n \n String logQuery =\n- \"INSERT INTO access_log (time, action) VALUES ('\" + time + \"', '\" + action + \"')\";\n+ \"INSERT INTO access_log (time, action) VALUES (?\" + \", ?\" + \")\";\n \n try {\n- Statement statement = connection.createStatement(TYPE_SCROLL_SENSITIVE, CONCUR_UPDATABLE);\n- statement.executeUpdate(logQuery);\n+ PreparedStatement statement = connection.prepareStatement(logQuery, TYPE_SCROLL_SENSITIVE, CONCUR_UPDATABLE);\n+ statement.setString(1, sdf.format(cal.getTime()));\n+ statement.setString(2, action);\n+ statement.execute();\n } catch (SQLException e) {\n System.err.println(e.getMessage());\n }","changes":[{"lineNumber":158,"properties":{},"description":"Parameterized SQL usage to prevent any bugs or vulnerabilities","diffSide":"left","packageActions":[],"parameters":[]}]}]},{"codemod":"pixee:java/sandbox-url-creation","summary":"Sandboxed URL creation to prevent SSRF attacks","description":"This change sandboxes the creation of [`java.net.URL`](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URL.html) objects so they will be more resistant to Server-Side Request Forgery (SSRF) attacks.\n\nMost of the time when you create a URL, you're intending to reference an HTTP endpoint, like an internal microservice. However, URLs can point to local file system files, a Gopher stream in your local network, a JAR file on a remote Internet site, and all kinds of other unexpected and undesirable stuff. When the URL values are influenced by attackers, they can trick your application into fetching internal resources, running malicious code, or otherwise harming the system. Consider the following code:\n\n```java\nString url = userInput.getServiceAddress();\nreturn IOUtils.toString(new URL(url).openConnection());\n```\n\nIn this case, an attacker could supply a value like `jar:file:/path/to/appserver/lib.jar` and attempt to read the contents of your application's code.\n\nOur changes introduce sandboxing around URL creation that force the developers to specify some boundaries on the types of URLs they expect to create:\n\n```diff\n+ import io.github.pixee.security.Urls;\n+ import io.github.pixee.security.HostValidator;\n ...\n String url = userInput.getServiceAddress();\n- URL u = new URL(url);\n+ URL u = Urls.create(url, Urls.HTTP_PROTOCOLS, HostValidator.DENY_COMMON_INFRASTRUCTURE_TARGETS);\n InputStream is = u.openConnection();\n```\n\nThis change alone reduces attack surface significantly, but can be enhanced to create even more security by specifying some controls around the hosts we expect to connect with:\n\n```diff\n+ import io.github.pixee.security.Urls;\n+ import io.github.pixee.security.HostValidator;\n ...\n HostValidator allowsOnlyGoodDotCom = HostValidator.fromAllowedHostPattern(Pattern.compile(\"good\\\\.com\"));\n URL u = Urls.create(url, Urls.HTTP_PROTOCOLS, allowsOnlyGoodDotCom);\n```\n\nNote: Beware temptation to write some validation on your own. Parsing URLs is difficult and differences between parsers in validation and execution will certainly lead to exploits as attackers [have repeatedly proven](https://www.blackhat.com/docs/us-17/thursday/us-17-Tsai-A-New-Era-Of-SSRF-Exploiting-URL-Parser-In-Trending-Programming-Languages.pdf).\n","failedFiles":[],"references":[{"url":"https://www.hacksplaining.com/prevention/ssrf","description":"https://www.hacksplaining.com/prevention/ssrf"},{"url":"https://portswigger.net/web-security/ssrf","description":"https://portswigger.net/web-security/ssrf"},{"url":"https://cheatsheetseries.owasp.org/cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html","description":"https://cheatsheetseries.owasp.org/cheatsheets/Server_Side_Request_Forgery_Prevention_Cheat_Sheet.html"},{"url":"https://www.rapid7.com/blog/post/2021/11/23/owasp-top-10-deep-dive-defending-against-server-side-request-forgery/","description":"https://www.rapid7.com/blog/post/2021/11/23/owasp-top-10-deep-dive-defending-against-server-side-request-forgery/"},{"url":"https://blog.assetnote.io/2021/01/13/blind-ssrf-chains/","description":"https://blog.assetnote.io/2021/01/13/blind-ssrf-chains/"}],"properties":{},"changeset":[{"path":"src/main/java/org/owasp/webgoat/lessons/jwt/claimmisuse/JWTHeaderJKUEndpoint.java","diff":"--- JWTHeaderJKUEndpoint.java\n+++ JWTHeaderJKUEndpoint.java\n@@ -6,6 +6,8 @@\n import com.auth0.jwt.JWT;\n import com.auth0.jwt.algorithms.Algorithm;\n import com.auth0.jwt.exceptions.JWTVerificationException;\n+import io.github.pixee.security.HostValidator;\n+import io.github.pixee.security.Urls;\n import java.net.MalformedURLException;\n import java.net.URL;\n import java.security.interfaces.RSAPublicKey;\n@@ -48,7 +50,7 @@\n try {\n var decodedJWT = JWT.decode(token);\n var jku = decodedJWT.getHeaderClaim(\"jku\");\n- JwkProvider jwkProvider = new JwkProviderBuilder(new URL(jku.asString())).build();\n+ JwkProvider jwkProvider = new JwkProviderBuilder(Urls.create(jku.asString(), Urls.HTTP_PROTOCOLS, HostValidator.DENY_COMMON_INFRASTRUCTURE_TARGETS)).build();\n var jwk = jwkProvider.get(decodedJWT.getKeyId());\n var algorithm = Algorithm.RSA256((RSAPublicKey) jwk.getPublicKey());\n JWT.require(algorithm).build().verify(decodedJWT);","changes":[{"lineNumber":51,"properties":{},"description":"Wrapped the URL creation with a method that forces the caller to pick allowed protocols and domains that this URL can reach","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/ssrf/SSRFTask2.java","diff":"--- SSRFTask2.java\n+++ SSRFTask2.java\n@@ -22,6 +22,8 @@\n \n package org.owasp.webgoat.lessons.ssrf;\n \n+import io.github.pixee.security.HostValidator;\n+import io.github.pixee.security.Urls;\n import java.io.IOException;\n import java.io.InputStream;\n import java.net.MalformedURLException;\n@@ -48,7 +50,7 @@\n protected AttackResult furBall(String url) {\n if (url.matches(\"http://ifconfig\\\\.pro\")) {\n String html;\n- try (InputStream in = new URL(url).openStream()) {\n+ try (InputStream in = Urls.create(url, Urls.HTTP_PROTOCOLS, HostValidator.DENY_COMMON_INFRASTRUCTURE_TARGETS).openStream()) {\n html =\n new String(in.readAllBytes(), StandardCharsets.UTF_8)\n .replaceAll(\"\\n\", \"
\"); // Otherwise the \\n gets escaped in the response","changes":[{"lineNumber":51,"properties":{},"description":"Wrapped the URL creation with a method that forces the caller to pick allowed protocols and domains that this URL can reach","diffSide":"left","packageActions":[{"action":"ADD","result":"SKIPPED","package":"pkg:maven/io.github.pixee/java-security-toolkit@1.1.2"}],"parameters":[]}]}]},{"codemod":"pixee:java/switch-literal-first","summary":"Switch order of literals to prevent NullPointerException","description":"This change defensively switches the order of literals in comparison expressions to ensure that no null pointer exceptions are unexpectedly thrown. Runtime exceptions especially can cause exceptional and unexpected code paths to be taken, and this can result in unexpected behavior. \n\nBoth simple vulnerabilities (like information disclosure) and complex vulnerabilities (like business logic flaws) can take advantage of these unexpected code paths.\n\nOur changes look something like this:\n\n```diff\n String fieldName = header.getFieldName();\n String fieldValue = header.getFieldValue();\n- if(fieldName.equals(\"requestId\")) {\n+ if(\"requestId\".equals(fieldName)) {\n logRequest(fieldValue);\n }\n```\n","failedFiles":[],"references":[{"url":"http://cwe.mitre.org/data/definitions/476.html","description":"http://cwe.mitre.org/data/definitions/476.html"},{"url":"https://en.wikibooks.org/wiki/Java_Programming/Preventing_NullPointerException","description":"https://en.wikibooks.org/wiki/Java_Programming/Preventing_NullPointerException"},{"url":"https://rules.sonarsource.com/java/RSPEC-1132/","description":"https://rules.sonarsource.com/java/RSPEC-1132/"}],"properties":{},"changeset":[{"path":"src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.java","diff":"--- AsciiDoctorTemplateResolver.java\n+++ AsciiDoctorTemplateResolver.java\n@@ -123,7 +123,7 @@\n \n private String computeResourceName(String resourceName, String language) {\n String computedResourceName;\n- if (language.equals(\"en\")) {\n+ if (\"en\".equals(language)) {\n computedResourceName = resourceName;\n } else {\n computedResourceName = resourceName.replace(\".adoc\", \"_\".concat(language).concat(\".adoc\"));","changes":[{"lineNumber":126,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/container/UserInterceptor.java","diff":"--- UserInterceptor.java\n+++ UserInterceptor.java\n@@ -35,7 +35,7 @@\n if (null != env) {\n String githubClientId =\n env.getProperty(\"spring.security.oauth2.client.registration.github.client-id\");\n- if (null != githubClientId && !githubClientId.equals(\"dummy\")) {\n+ if (null != githubClientId && !\"dummy\".equals(githubClientId)) {\n modelAndView.getModel().put(\"oauth\", Boolean.TRUE);\n }\n } else {","changes":[{"lineNumber":38,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/container/lessons/Assignment.java","diff":"--- Assignment.java\n+++ Assignment.java\n@@ -63,7 +63,7 @@\n }\n \n public Assignment(String name, String path, List hints) {\n- if (path.equals(\"\") || path.equals(\"/\") || path.equals(\"/WebGoat/\")) {\n+ if (\"\".equals(path) || \"/\".equals(path) || \"/WebGoat/\".equals(path)) {\n throw new IllegalStateException(\n \"The path of assignment '\"\n + name","changes":[{"lineNumber":66,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":66,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":66,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/bypassrestrictions/BypassRestrictionsFieldRestrictions.java","diff":"--- BypassRestrictionsFieldRestrictions.java\n+++ BypassRestrictionsFieldRestrictions.java\n@@ -40,13 +40,13 @@\n @RequestParam String checkbox,\n @RequestParam String shortInput,\n @RequestParam String readOnlyInput) {\n- if (select.equals(\"option1\") || select.equals(\"option2\")) {\n+ if (\"option1\".equals(select) || \"option2\".equals(select)) {\n return failed(this).build();\n }\n- if (radio.equals(\"option1\") || radio.equals(\"option2\")) {\n+ if (\"option1\".equals(radio) || \"option2\".equals(radio)) {\n return failed(this).build();\n }\n- if (checkbox.equals(\"on\") || checkbox.equals(\"off\")) {\n+ if (\"on\".equals(checkbox) || \"off\".equals(checkbox)) {\n return failed(this).build();\n }\n if (shortInput.length() <= 5) {","changes":[{"lineNumber":43,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":43,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":46,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":46,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":49,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":49,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/Assignment7.java","diff":"--- Assignment7.java\n+++ Assignment7.java\n@@ -57,7 +57,7 @@\n \n @GetMapping(\"/challenge/7/reset-password/{link}\")\n public ResponseEntity resetPassword(@PathVariable(value = \"link\") String link) {\n- if (link.equals(ADMIN_PASSWORD_LINK)) {\n+ if (ADMIN_PASSWORD_LINK.equals(link)) {\n return ResponseEntity.accepted()\n .body(\n \"

Success!!

\"","changes":[{"lineNumber":60,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/PasswordResetLink.java","diff":"--- PasswordResetLink.java\n+++ PasswordResetLink.java\n@@ -12,7 +12,7 @@\n \n public String createPasswordReset(String username, String key) {\n Random random = new Random();\n- if (username.equalsIgnoreCase(\"admin\")) {\n+ if (\"admin\".equalsIgnoreCase(username)) {\n // Admin has a fix reset link\n random.setSeed(key.length());\n }","changes":[{"lineNumber":15,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/cryptography/SecureDefaultsAssignment.java","diff":"--- SecureDefaultsAssignment.java\n+++ SecureDefaultsAssignment.java\n@@ -44,7 +44,7 @@\n public AttackResult completed(\n @RequestParam String secretFileName, @RequestParam String secretText)\n throws NoSuchAlgorithmException {\n- if (secretFileName != null && secretFileName.equals(\"default_secret\")) {\n+ if (secretFileName != null && \"default_secret\".equals(secretFileName)) {\n if (secretText != null\n && HashingAssignment.getHash(secretText, \"SHA-256\")\n .equalsIgnoreCase(","changes":[{"lineNumber":47,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/cryptography/XOREncodingAssignment.java","diff":"--- XOREncodingAssignment.java\n+++ XOREncodingAssignment.java\n@@ -37,7 +37,7 @@\n @PostMapping(\"/crypto/encoding/xor\")\n @ResponseBody\n public AttackResult completed(@RequestParam String answer_pwd1) {\n- if (answer_pwd1 != null && answer_pwd1.equals(\"databasepassword\")) {\n+ if (answer_pwd1 != null && \"databasepassword\".equals(answer_pwd1)) {\n return success(this).feedback(\"crypto-encoding-xor.success\").build();\n }\n return failed(this).feedback(\"crypto-encoding-xor.empty\").build();","changes":[{"lineNumber":40,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/csrf/CSRFGetFlag.java","diff":"--- CSRFGetFlag.java\n+++ CSRFGetFlag.java\n@@ -52,7 +52,7 @@\n String referer = (req.getHeader(\"referer\") == null) ? \"NULL\" : req.getHeader(\"referer\");\n String[] refererArr = referer.split(\"/\");\n \n- if (referer.equals(\"NULL\")) {\n+ if (\"NULL\".equals(referer)) {\n if (\"true\".equals(req.getParameter(\"csrf\"))) {\n Random random = new Random();\n userSessionData.setValue(\"csrf-get-success\", random.nextInt(65536));","changes":[{"lineNumber":55,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/csrf/ForgedReviews.java","diff":"--- ForgedReviews.java\n+++ ForgedReviews.java\n@@ -103,7 +103,7 @@\n reviews.add(review);\n userReviews.put(webSession.getUserName(), reviews);\n // short-circuit\n- if (validateReq == null || !validateReq.equals(weakAntiCSRF)) {\n+ if (validateReq == null || !weakAntiCSRF.equals(validateReq)) {\n return failed(this).feedback(\"csrf-you-forgot-something\").build();\n }\n // we have the spoofed files","changes":[{"lineNumber":106,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/idor/IDORDiffAttributes.java","diff":"--- IDORDiffAttributes.java\n+++ IDORDiffAttributes.java\n@@ -47,10 +47,10 @@\n if (diffAttribs.length < 2) {\n return failed(this).feedback(\"idor.diff.attributes.missing\").build();\n }\n- if (diffAttribs[0].toLowerCase().trim().equals(\"userid\")\n- && diffAttribs[1].toLowerCase().trim().equals(\"role\")\n- || diffAttribs[1].toLowerCase().trim().equals(\"userid\")\n- && diffAttribs[0].toLowerCase().trim().equals(\"role\")) {\n+ if (\"userid\".equals(diffAttribs[0].toLowerCase().trim())\n+ && \"role\".equals(diffAttribs[1].toLowerCase().trim())\n+ || \"userid\".equals(diffAttribs[1].toLowerCase().trim())\n+ && \"role\".equals(diffAttribs[0].toLowerCase().trim())) {\n return success(this).feedback(\"idor.diff.success\").build();\n } else {\n return failed(this).feedback(\"idor.diff.failure\").build();","changes":[{"lineNumber":50,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":51,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":52,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":53,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/idor/IDOREditOtherProfile.java","diff":"--- IDOREditOtherProfile.java\n+++ IDOREditOtherProfile.java\n@@ -103,7 +103,7 @@\n return failed(this).feedback(\"idor.edit.profile.failure4\").build();\n }\n \n- if (currentUserProfile.getColor().equals(\"black\") && currentUserProfile.getRole() <= 1) {\n+ if (\"black\".equals(currentUserProfile.getColor()) && currentUserProfile.getRole() <= 1) {\n return success(this)\n .feedback(\"idor.edit.profile.success2\")\n .output(userSessionData.getValue(\"idor-updated-own-profile\").toString())","changes":[{"lineNumber":106,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOtherProfile.java","diff":"--- IDORViewOtherProfile.java\n+++ IDORViewOtherProfile.java\n@@ -66,7 +66,7 @@\n // secure code would ensure there was a horizontal access control check prior to dishing up\n // the requested profile\n if (requestedProfile.getUserId() != null\n- && requestedProfile.getUserId().equals(\"2342388\")) {\n+ && \"2342388\".equals(requestedProfile.getUserId())) {\n return success(this)\n .feedback(\"idor.view.profile.success\")\n .output(requestedProfile.profileToMap().toString())","changes":[{"lineNumber":69,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOwnProfileAltUrl.java","diff":"--- IDORViewOwnProfileAltUrl.java\n+++ IDORViewOwnProfileAltUrl.java\n@@ -52,9 +52,9 @@\n String authUserId = (String) userSessionData.getValue(\"idor-authenticated-user-id\");\n // don't care about http://localhost:8080 ... just want WebGoat/\n String[] urlParts = url.split(\"/\");\n- if (urlParts[0].equals(\"WebGoat\")\n- && urlParts[1].equals(\"IDOR\")\n- && urlParts[2].equals(\"profile\")\n+ if (\"WebGoat\".equals(urlParts[0])\n+ && \"IDOR\".equals(urlParts[1])\n+ && \"profile\".equals(urlParts[2])\n && urlParts[3].equals(authUserId)) {\n UserProfile userProfile = new UserProfile(authUserId);\n return success(this)","changes":[{"lineNumber":55,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":56,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":57,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/idor/UserProfile.java","diff":"--- UserProfile.java\n+++ UserProfile.java\n@@ -44,14 +44,14 @@\n //\n private void setProfileFromId(String id) {\n // emulate look up from database\n- if (id.equals(\"2342384\")) {\n+ if (\"2342384\".equals(id)) {\n this.userId = id;\n this.color = \"yellow\";\n this.name = \"Tom Cat\";\n this.size = \"small\";\n this.isAdmin = false;\n this.role = 3;\n- } else if (id.equals(\"2342388\")) {\n+ } else if (\"2342388\".equals(id)) {\n this.userId = id;\n this.color = \"brown\";\n this.name = \"Buffalo Bill\";","changes":[{"lineNumber":47,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":54,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/logging/LogBleedingTask.java","diff":"--- LogBleedingTask.java\n+++ LogBleedingTask.java\n@@ -57,7 +57,7 @@\n return failed(this).output(\"Please provide username (Admin) and password\").build();\n }\n \n- if (username.equals(\"Admin\") && password.equals(this.password)) {\n+ if (\"Admin\".equals(username) && password.equals(this.password)) {\n return success(this).build();\n }\n ","changes":[{"lineNumber":60,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenus.java","diff":"--- MissingFunctionACHiddenMenus.java\n+++ MissingFunctionACHiddenMenus.java\n@@ -43,11 +43,11 @@\n produces = {\"application/json\"})\n @ResponseBody\n public AttackResult completed(String hiddenMenu1, String hiddenMenu2) {\n- if (hiddenMenu1.equals(\"Users\") && hiddenMenu2.equals(\"Config\")) {\n+ if (\"Users\".equals(hiddenMenu1) && \"Config\".equals(hiddenMenu2)) {\n return success(this).output(\"\").feedback(\"access-control.hidden-menus.success\").build();\n }\n \n- if (hiddenMenu1.equals(\"Config\") && hiddenMenu2.equals(\"Users\")) {\n+ if (\"Config\".equals(hiddenMenu1) && \"Users\".equals(hiddenMenu2)) {\n return failed(this).output(\"\").feedback(\"access-control.hidden-menus.close\").build();\n }\n ","changes":[{"lineNumber":46,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":46,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":50,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":50,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java","diff":"--- ResetLinkAssignment.java\n+++ ResetLinkAssignment.java\n@@ -85,7 +85,7 @@\n if (TOM_EMAIL.equals(email)) {\n String passwordTom =\n usersToTomPassword.getOrDefault(getWebSession().getUserName(), PASSWORD_TOM_9);\n- if (passwordTom.equals(PASSWORD_TOM_9)) {\n+ if (PASSWORD_TOM_9.equals(passwordTom)) {\n return failed(this).feedback(\"login_failed\").build();\n } else if (passwordTom.equals(password)) {\n return success(this).build();","changes":[{"lineNumber":88,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/spoofcookie/SpoofCookieAssignment.java","diff":"--- SpoofCookieAssignment.java\n+++ SpoofCookieAssignment.java\n@@ -114,7 +114,7 @@\n return failed(this).output(e.getMessage()).build();\n }\n if (users.containsKey(cookieUsername)) {\n- if (cookieUsername.equals(ATTACK_USERNAME)) {\n+ if (ATTACK_USERNAME.equals(cookieUsername)) {\n return success(this).build();\n }\n return failed(this)","changes":[{"lineNumber":117,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson2.java","diff":"--- SqlInjectionLesson2.java\n+++ SqlInjectionLesson2.java\n@@ -67,7 +67,7 @@\n \n results.first();\n \n- if (results.getString(\"department\").equals(\"Marketing\")) {\n+ if (\"Marketing\".equals(results.getString(\"department\"))) {\n output.append(\"\");\n output.append(SqlInjectionLesson8.generateTable(results));\n return success(this).feedback(\"sql-injection.2.success\").output(output.toString()).build();","changes":[{"lineNumber":70,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/sqlinjection/introduction/SqlInjectionLesson3.java","diff":"--- SqlInjectionLesson3.java\n+++ SqlInjectionLesson3.java\n@@ -66,7 +66,7 @@\n StringBuilder output = new StringBuilder();\n // user completes lesson if the department of Tobi Barnett now is 'Sales'\n results.first();\n- if (results.getString(\"department\").equals(\"Sales\")) {\n+ if (\"Sales\".equals(results.getString(\"department\"))) {\n output.append(\"\");\n output.append(SqlInjectionLesson8.generateTable(results));\n return success(this).output(output.toString()).build();","changes":[{"lineNumber":69,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/xss/CrossSiteScriptingLesson3.java","diff":"--- CrossSiteScriptingLesson3.java\n+++ CrossSiteScriptingLesson3.java\n@@ -68,10 +68,10 @@\n && include.contains(\"%>\")) {\n includeCorrect = true;\n }\n- if (fistNameElement.equals(\"${e:forHtml(param.first_name)}\")) {\n+ if (\"${e:forHtml(param.first_name)}\".equals(fistNameElement)) {\n firstNameCorrect = true;\n }\n- if (lastNameElement.equals(\"${e:forHtml(param.last_name)}\")) {\n+ if (\"${e:forHtml(param.last_name)}\".equals(lastNameElement)) {\n lastNameCorrect = true;\n }\n ","changes":[{"lineNumber":71,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":74,"properties":{},"description":"Switch order of literals to prevent NullPointerException","diffSide":"left","packageActions":[],"parameters":[]}]}]},{"codemod":"pixee:java/secure-random","summary":"Introduced protections against predictable RNG abuse","description":"This change replaces all new instances of `java.util.Random` with the marginally slower, but much more secure `java.security.SecureRandom`.\n\nWe have to work pretty hard to get computers to generate genuinely unguessable random bits. The `java.util.Random` type uses a method of pseudo-random number generation that unfortunately emits fairly predictable numbers.\n\nIf the numbers it emits are predictable, then it's obviously not safe to use in cryptographic operations, file name creation, token construction, password generation, and anything else that's related to security. In fact, it may affect security even if it's not directly obvious.\n\nSwitching to a more secure version is simple and our changes all look something like this:\n\n```diff\n- Random r = new Random();\n+ Random r = new java.security.SecureRandom();\n```\n","failedFiles":[],"references":[{"url":"https://owasp.org/www-community/vulnerabilities/Insecure_Randomness","description":"https://owasp.org/www-community/vulnerabilities/Insecure_Randomness"},{"url":"https://metebalci.com/blog/everything-about-javas-securerandom/","description":"https://metebalci.com/blog/everything-about-javas-securerandom/"},{"url":"https://cwe.mitre.org/data/definitions/330.html","description":"https://cwe.mitre.org/data/definitions/330.html"}],"properties":{},"changeset":[{"path":"src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/ImageServlet.java","diff":"--- ImageServlet.java\n+++ ImageServlet.java\n@@ -1,5 +1,6 @@\n package org.owasp.webgoat.lessons.challenges.challenge1;\n \n+import java.security.SecureRandom;\n import static org.springframework.web.bind.annotation.RequestMethod.GET;\n import static org.springframework.web.bind.annotation.RequestMethod.POST;\n \n@@ -14,7 +15,7 @@\n @RestController\n public class ImageServlet {\n \n- public static final int PINCODE = new Random().nextInt(10000);\n+ public static final int PINCODE = new SecureRandom().nextInt(10000);\n \n @RequestMapping(\n method = {GET, POST},","changes":[{"lineNumber":17,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/PasswordResetLink.java","diff":"--- PasswordResetLink.java\n+++ PasswordResetLink.java\n@@ -1,5 +1,6 @@\n package org.owasp.webgoat.lessons.challenges.challenge7;\n \n+import java.security.SecureRandom;\n import java.util.Random;\n \n /**\n@@ -11,7 +12,7 @@\n public class PasswordResetLink {\n \n public String createPasswordReset(String username, String key) {\n- Random random = new Random();\n+ Random random = new SecureRandom();\n if (\"admin\".equalsIgnoreCase(username)) {\n // Admin has a fix reset link\n random.setSeed(key.length());","changes":[{"lineNumber":14,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/cryptography/EncodingAssignment.java","diff":"--- EncodingAssignment.java\n+++ EncodingAssignment.java\n@@ -23,6 +23,7 @@\n package org.owasp.webgoat.lessons.cryptography;\n \n import jakarta.servlet.http.HttpServletRequest;\n+import java.security.SecureRandom;\n import java.util.Base64;\n import java.util.Random;\n import org.owasp.webgoat.container.assignments.AssignmentEndpoint;\n@@ -49,7 +50,7 @@\n String username = request.getUserPrincipal().getName();\n if (basicAuth == null) {\n String password =\n- HashingAssignment.SECRETS[new Random().nextInt(HashingAssignment.SECRETS.length)];\n+ HashingAssignment.SECRETS[new SecureRandom().nextInt(HashingAssignment.SECRETS.length)];\n basicAuth = getBasicAuth(username, password);\n request.getSession().setAttribute(\"basicAuth\", basicAuth);\n }","changes":[{"lineNumber":52,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/cryptography/HashingAssignment.java","diff":"--- HashingAssignment.java\n+++ HashingAssignment.java\n@@ -25,6 +25,7 @@\n import jakarta.servlet.http.HttpServletRequest;\n import java.security.MessageDigest;\n import java.security.NoSuchAlgorithmException;\n+import java.security.SecureRandom;\n import java.util.Random;\n import javax.xml.bind.DatatypeConverter;\n import org.owasp.webgoat.container.assignments.AssignmentEndpoint;\n@@ -50,7 +51,7 @@\n String md5Hash = (String) request.getSession().getAttribute(\"md5Hash\");\n if (md5Hash == null) {\n \n- String secret = SECRETS[new Random().nextInt(SECRETS.length)];\n+ String secret = SECRETS[new SecureRandom().nextInt(SECRETS.length)];\n \n MessageDigest md = MessageDigest.getInstance(\"MD5\");\n md.update(secret.getBytes());\n@@ -68,7 +69,7 @@\n \n String sha256 = (String) request.getSession().getAttribute(\"sha256\");\n if (sha256 == null) {\n- String secret = SECRETS[new Random().nextInt(SECRETS.length)];\n+ String secret = SECRETS[new SecureRandom().nextInt(SECRETS.length)];\n sha256 = getHash(secret, \"SHA-256\");\n request.getSession().setAttribute(\"sha256Hash\", sha256);\n request.getSession().setAttribute(\"sha256Secret\", secret);","changes":[{"lineNumber":53,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":71,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/csrf/CSRFGetFlag.java","diff":"--- CSRFGetFlag.java\n+++ CSRFGetFlag.java\n@@ -23,6 +23,7 @@\n package org.owasp.webgoat.lessons.csrf;\n \n import jakarta.servlet.http.HttpServletRequest;\n+import java.security.SecureRandom;\n import java.util.HashMap;\n import java.util.Map;\n import java.util.Random;\n@@ -54,13 +55,13 @@\n \n if (\"NULL\".equals(referer)) {\n if (\"true\".equals(req.getParameter(\"csrf\"))) {\n- Random random = new Random();\n+ Random random = new SecureRandom();\n userSessionData.setValue(\"csrf-get-success\", random.nextInt(65536));\n response.put(\"success\", true);\n response.put(\"message\", pluginMessages.getMessage(\"csrf-get-null-referer.success\"));\n response.put(\"flag\", userSessionData.getValue(\"csrf-get-success\"));\n } else {\n- Random random = new Random();\n+ Random random = new SecureRandom();\n userSessionData.setValue(\"csrf-get-success\", random.nextInt(65536));\n response.put(\"success\", true);\n response.put(\"message\", pluginMessages.getMessage(\"csrf-get-other-referer.success\"));\n@@ -71,7 +72,7 @@\n response.put(\"message\", \"Appears the request came from the original host\");\n response.put(\"flag\", null);\n } else {\n- Random random = new Random();\n+ Random random = new SecureRandom();\n userSessionData.setValue(\"csrf-get-success\", random.nextInt(65536));\n response.put(\"success\", true);\n response.put(\"message\", pluginMessages.getMessage(\"csrf-get-other-referer.success\"));","changes":[{"lineNumber":57,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":63,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]},{"lineNumber":74,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/hijacksession/cas/HijackSessionAuthenticationProvider.java","diff":"--- HijackSessionAuthenticationProvider.java\n+++ HijackSessionAuthenticationProvider.java\n@@ -23,6 +23,7 @@\n \n package org.owasp.webgoat.lessons.hijacksession.cas;\n \n+import java.security.SecureRandom;\n import java.time.Instant;\n import java.util.LinkedList;\n import java.util.Queue;\n@@ -45,7 +46,7 @@\n public class HijackSessionAuthenticationProvider implements AuthenticationProvider {\n \n private Queue sessions = new LinkedList<>();\n- private static long id = new Random().nextLong() & Long.MAX_VALUE;\n+ private static long id = new SecureRandom().nextLong() & Long.MAX_VALUE;\n protected static final int MAX_SESSIONS = 50;\n \n private static final DoublePredicate PROBABILITY_DOUBLE_PREDICATE = pr -> pr < 0.75;","changes":[{"lineNumber":48,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]}]},{"path":"src/main/java/org/owasp/webgoat/lessons/jwt/JWTSecretKeyEndpoint.java","diff":"--- JWTSecretKeyEndpoint.java\n+++ JWTSecretKeyEndpoint.java\n@@ -27,6 +27,7 @@\n import io.jsonwebtoken.Jwts;\n import io.jsonwebtoken.SignatureAlgorithm;\n import io.jsonwebtoken.impl.TextCodec;\n+import java.security.SecureRandom;\n import java.time.Instant;\n import java.util.Calendar;\n import java.util.Date;\n@@ -50,7 +51,7 @@\n \"victory\", \"business\", \"available\", \"shipping\", \"washington\"\n };\n public static final String JWT_SECRET =\n- TextCodec.BASE64.encode(SECRETS[new Random().nextInt(SECRETS.length)]);\n+ TextCodec.BASE64.encode(SECRETS[new SecureRandom().nextInt(SECRETS.length)]);\n private static final String WEBGOAT_USER = \"WebGoat\";\n private static final List expectedClaims =\n List.of(\"iss\", \"iat\", \"exp\", \"aud\", \"sub\", \"username\", \"Email\", \"Role\");","changes":[{"lineNumber":53,"properties":{},"description":"Replaced the weak pseudo-random number generator with a strong one","diffSide":"left","packageActions":[],"parameters":[]}]}]}]} \ No newline at end of file