Bläddra i källkod

[fix] do not allow underscore in engine names - closes #708

Adam Tauber 8 år sedan
förälder
incheckning
86daef2063
2 ändrade filer med 10 tillägg och 4 borttagningar
  1. 9
    3
      searx/engines/__init__.py
  2. 1
    1
      searx/settings.yml

+ 9
- 3
searx/engines/__init__.py Visa fil

@@ -57,11 +57,17 @@ def load_module(filename):
57 57
 
58 58
 
59 59
 def load_engine(engine_data):
60
-    engine_name = engine_data['engine']
60
+
61
+    if '_' in engine_data['name']:
62
+        logger.error('Engine name conains underscore: "{}"'.format(engine_data['name']))
63
+        sys.exit(1)
64
+
65
+    engine_module = engine_data['engine']
66
+
61 67
     try:
62
-        engine = load_module(engine_name + '.py')
68
+        engine = load_module(engine_module + '.py')
63 69
     except:
64
-        logger.exception('Cannot load engine "{}"'.format(engine_name))
70
+        logger.exception('Cannot load engine "{}"'.format(engine_module))
65 71
         return None
66 72
 
67 73
     for param_name in engine_data:

+ 1
- 1
searx/settings.yml Visa fil

@@ -377,7 +377,7 @@ engines:
377 377
     timeout : 10.0
378 378
     disabled : True
379 379
 
380
-  - name : scanr_structures
380
+  - name : scanr structures
381 381
     shortcut: scs
382 382
     engine : scanr_structures
383 383
     disabled : True