Merge pull request #1669 from GSA/remove-findings-by-code-analysis

remove code not used; patch evel()

Author: rshewitt

.github/workflows/commit.yml

@@ -41,20 +41,6 @@ jobs:
       - name: test
         run: make validate-proxy
 
-  test_importer:
-    name: test importer
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-          architecture: x64
-      - name: test_importer
-        run: make test-import-tool
-
   test_vulnerability:
     name: test vulnerability
     runs-on: ubuntu-latest

Makefile

@@ -132,14 +132,6 @@ search-index-rebuild:
 copy-src:
 	docker cp catalog-app_ckan_1:$(CKAN_HOME)/src .
 
-test-import-tool:
-	cd tools/harvest_source_import && \
-		pip install pip==20.3.3  && \
-		pip install -r dev-requirements.txt && \
-		flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics  && \
-		flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics  && \
-		python -m pytest --vcr-record=none tests/
-
 lint-all:
 	docker compose exec -T ckan \
 		bash -c "cd $(CKAN_HOME)/src && \

ckan/setup/prerun.py

@@ -12,6 +12,7 @@
 
 import time
 import re
+import ast
 
 ckan_ini = os.environ.get("CKAN_INI", "/srv/app/ckan.ini")
 
@@ -88,8 +89,8 @@ def check_solr_connection(retry=None):
         # GSA FIX: convert Solr 'true' to Python 'True'
         try:
             pythonified = str(connection.text).replace('true', 'True')
-            eval(pythonified)
-        except TypeError:
+            ast.literal_eval(pythonified)
+        except (ValueError, SyntaxError):
             pass