[pull] main from benbusby:main

README.md

@@ -514,9 +514,10 @@ A lot of the app currently piggybacks on Google's existing support for fetching
 | Website | Country | Language | Cloudflare |
 |-|-|-|-|
 | [https://search.albony.xyz](https://search.albony.xyz/) | 🇮🇳 IN | Multi-choice |  |
-| [https://search.garudalinux.org](https://search.garudalinux.org) | 🇩🇪 DE | Multi-choice |  |
+| [https://search.garudalinux.org](https://search.garudalinux.org) | 🇫🇮 FI | Multi-choice | ✅ |
+| [https://search.dr460nf1r3.org](https://search.dr460nf1r3.org) | 🇩🇪 DE | Multi-choice | ✅ |
 | [https://whooglesearch.net](https://whooglesearch.net) | 🇩🇪 DE | Spanish |  |
-| [https://s.alefvanoon.xyz](https://s.alefvanoon.xyz) | 🇺🇸 US | Multi-choice | ✅ |
+| [https://s.tokhmi.xyz](https://s.tokhmi.xyz) | 🇺🇸 US | Multi-choice | ✅ |
 | [https://www.whooglesearch.ml](https://www.whooglesearch.ml) | 🇺🇸 US | English | |
 | [https://search.sethforprivacy.com](https://search.sethforprivacy.com) | 🇩🇪 DE | English | |
 | [https://whoogle.dcs0.hu](https://whoogle.dcs0.hu) | 🇭🇺 HU | Multi-choice | |

app.json

@@ -15,6 +15,11 @@
   ],
   "stack": "container",
   "env": {
+    "WHOOGLE_URL_PREFIX": {
+      "description": "The URL prefix to use for the whoogle instance (i.e. \"/whoogle\")",
+      "value": "",
+      "required": false
+    },
     "WHOOGLE_USER": {
       "description": "The username for basic auth. WHOOGLE_PASS must also be set if used. Leave empty to disable.",
       "value": "",

app/__init__.py

@@ -26,16 +26,24 @@
     load_dotenv(os.path.join(os.path.dirname(os.path.abspath(__file__)),
                              dotenv_path))
 
+# Session values
+# NOTE: SESSION_COOKIE_SAMESITE must be set to 'lax' to allow the user's
+# previous session to persist when accessing the instance from an external
+# link. Setting this value to 'strict' causes Whoogle to revalidate a new
+# session, and fail, resulting in cookies being disabled.
+#
+# This could be re-evaluated if Whoogle ever switches to client side
+# configuration instead.
 app.default_key = generate_user_key()
 app.config['SECRET_KEY'] = os.urandom(32)
 app.config['SESSION_TYPE'] = 'filesystem'
-app.config['SESSION_COOKIE_SAMESITE'] = 'strict'
+app.config['SESSION_COOKIE_SAMESITE'] = 'Lax'
 
 if os.getenv('HTTPS_ONLY'):
     app.config['SESSION_COOKIE_NAME'] = '__Secure-session'
     app.config['SESSION_COOKIE_SECURE'] = True
 
-app.config['VERSION_NUMBER'] = '0.7.1'
+app.config['VERSION_NUMBER'] = '0.7.2'
 app.config['APP_ROOT'] = os.getenv(
     'APP_ROOT',
     os.path.dirname(os.path.abspath(__file__)))

app/filter.py

@@ -72,7 +72,7 @@ def clean_css(css: str, page_url: str) -> str:
             continue
         css = css.replace(
             url,
-            f'/element?type=image/png&url={abs_url}'
+            f'{Endpoint.element}?type=image/png&url={abs_url}'
         )
 
     return css
@@ -410,8 +410,10 @@ def update_link(self, link: Tag) -> None:
             None (the tag is updated directly)
 
         """
+        link_netloc = urlparse.urlparse(link['href']).netloc
+
         # Remove any elements that direct to unsupported Google pages
-        if any(url in link['href'] for url in unsupported_g_pages):
+        if any(url in link_netloc for url in unsupported_g_pages):
             # FIXME: The "Shopping" tab requires further filtering (see #136)
             # Temporarily removing all links to that tab for now.
             parent = link.parent
@@ -466,7 +468,8 @@ def update_link(self, link: Tag) -> None:
             if href.startswith(MAPS_URL):
                 # Maps links don't work if a site filter is applied
                 link['href'] = MAPS_URL + "?q=" + clean_query(q)
-            elif href.startswith('/?') or href.startswith('/search?'):
+            elif (href.startswith('/?') or href.startswith('/search?') or
+                  href.startswith('/imgres?')):
                 # make sure that tags can be clicked as relative URLs
                 link['href'] = href[1:]
             elif href.startswith('/intl/'):

app/routes.py

@@ -432,22 +432,6 @@ def config():
         return redirect(url_for('.index'), code=403)
 
 
-@app.route(f'/{Endpoint.url}', methods=['GET'])
-@session_required
-@auth_required
-def url():
-    if 'url' in request.args:
-        return redirect(request.args.get('url'))
-
-    q = request.args.get('q')
-    if len(q) > 0 and 'http' in q:
-        return redirect(q)
-    else:
-        return render_template(
-            'error.html',
-            error_message='Unable to resolve query: ' + q)
-
-
 @app.route(f'/{Endpoint.imgres}')
 @session_required
 @auth_required
@@ -536,7 +520,7 @@ def window():
 
     # Use anonymous view for all links on page
     for a in results.find_all('a', {'href': True}):
-        a['href'] = '/window?location=' + a['href'] + (
+        a['href'] = f'{Endpoint.window}?location=' + a['href'] + (
             '&nojs=1' if 'nojs' in request.args else '')
 
     # Remove all iframes -- these are commonly used inside of <noscript> tags

app/static/settings/translations.json

@@ -133,7 +133,7 @@
         "images": "Bilder",
         "maps": "Maps",
         "videos": "Videos",
-        "news": "Nieuws",
+        "news": "Nachrichten",
         "books": "Bücher",
         "anon-view": "Anonyme Ansicht"
     },
@@ -554,27 +554,27 @@
     "lang_zh-TW": {
         "search": "搜尋",
         "config": "設定",
-        "config-country": "設置國家",
-        "config-lang": "界面語言",
+        "config-country": "設定國家",
+        "config-lang": "介面語言",
         "config-lang-search": "搜尋語言",
         "config-near": "接近",
-        "config-near-help": "城市名",
-        "config-block": "排除",
-        "config-block-help": "網址列表，以逗號分隔",
-        "config-block-title": "按標題屏蔽",
-        "config-block-title-help": "使用正則表達式",
-        "config-block-url": "按網址屏蔽",
-        "config-block-url-help": "使用正則表達式",
+        "config-near-help": "城市名稱",
+        "config-block": "封鎖",
+        "config-block-help": "以逗號分隔之網址列表",
+        "config-block-title": "按標題封鎖",
+        "config-block-title-help": "使用正規表達式",
+        "config-block-url": "按網址封鎖",
+        "config-block-url-help": "使用正規表達式",
         "config-theme": "主題",
-        "config-nojs": "在匿名視圖中刪除 Javascript",
-        "config-anon-view": "顯示匿名查看鏈接",
+        "config-nojs": "於匿名檢視中刪除 JavaScript",
+        "config-anon-view": "顯示匿名檢視鏈接",
         "config-dark": "深色模式",
         "config-safe": "安全搜尋",
-        "config-alts": "將社群網站連結換掉",
-        "config-alts-help": "將 Twitter/YouTube/Instagram 等網站的連結替換為尊重隱私的第三方網站。",
+        "config-alts": "將社群網站連結替換",
+        "config-alts-help": "將 Twitter/YouTube/Instagram 等網站之連結替換為尊重隱私的第三方網站。",
         "config-new-tab": "以新分頁開啟連結",
         "config-images": "完整尺寸圖片搜尋",
-        "config-images-help": "（實驗性）在桌面版圖片搜尋中增加「查看圖片」選項。這會使搜尋結果圖片解析度降低",
+        "config-images-help": "（實驗性）在桌面版圖片搜尋中增加「檢視圖片」選項。這會使搜尋結果圖片解析度降低",
         "config-tor": "使用 Tor",
         "config-get-only": "僅限於 GET 要求",
         "config-url": "首頁網址",
@@ -595,7 +595,7 @@
         "videos": "影片",
         "news": "新聞",
         "books": "書籍",
-        "anon-view": "匿名視圖"
+        "anon-view": "匿名檢視"
     },
     "lang_bg": {
         "search": "Търсене",

app/templates/error.html

@@ -16,7 +16,7 @@
 <div>
     <h1>Error</h1>
     <p>
-        {{ error_message|safe }}
+        {{ error_message }}
     </p>
     <hr>
     <p>

app/utils/results.py

@@ -186,7 +186,7 @@ def append_nojs(result: BeautifulSoup) -> None:
 
     """
     nojs_link = BeautifulSoup(features='html.parser').new_tag('a')
-    nojs_link['href'] = f'/{Endpoint.window}?nojs=1&location=' + result['href']
+    nojs_link['href'] = f'{Endpoint.window}?nojs=1&location=' + result['href']
     nojs_link.string = ' NoJS Link'
     result.append(nojs_link)
 
@@ -206,7 +206,7 @@ def append_anon_view(result: BeautifulSoup, config: Config) -> None:
     av_link = BeautifulSoup(features='html.parser').new_tag('a')
     nojs = 'nojs=1' if config.nojs else 'nojs=0'
     location = f'location={result["href"]}'
-    av_link['href'] = f'/{Endpoint.window}?{nojs}&{location}'
+    av_link['href'] = f'{Endpoint.window}?{nojs}&{location}'
     translation = current_app.config['TRANSLATIONS'][
        config.get_localization_lang()
     ]
@@ -227,26 +227,28 @@ def add_ip_card(html_soup: BeautifulSoup, ip: str) -> BeautifulSoup:
         BeautifulSoup
 
     """
-    # HTML IP card tag
-    ip_tag = html_soup.new_tag('div')
-    ip_tag['class'] = 'ZINbbc xpd O9g5cc uUPGi'
-
-    # For IP Address html tag
-    ip_address = html_soup.new_tag('div')
-    ip_address['class'] = 'kCrYT ip-address-div'
-    ip_address.string = ip
-
-    # Text below the IP address
-    ip_text = html_soup.new_tag('div')
-    ip_text.string = 'Your public IP address'
-    ip_text['class'] = 'kCrYT ip-text-div'
-
-    # Adding all the above html tags to the IP card
-    ip_tag.append(ip_address)
-    ip_tag.append(ip_text)
-
-    # Insert the element at the top of the result list
-    html_soup.select_one('#main').insert_before(ip_tag)
+    main_div = html_soup.select_one('#main')
+    if main_div:
+        # HTML IP card tag
+        ip_tag = html_soup.new_tag('div')
+        ip_tag['class'] = 'ZINbbc xpd O9g5cc uUPGi'
+
+        # For IP Address html tag
+        ip_address = html_soup.new_tag('div')
+        ip_address['class'] = 'kCrYT ip-address-div'
+        ip_address.string = ip
+
+        # Text below the IP address
+        ip_text = html_soup.new_tag('div')
+        ip_text.string = 'Your public IP address'
+        ip_text['class'] = 'kCrYT ip-text-div'
+
+        # Adding all the above html tags to the IP card
+        ip_tag.append(ip_address)
+        ip_tag.append(ip_text)
+
+        # Insert the element at the top of the result list
+        main_div.insert_before(ip_tag)
     return html_soup
 
 

charts/whoogle/Chart.yaml

@@ -3,7 +3,7 @@ name: whoogle
 description: A self hosted search engine on Kubernetes
 type: application
 version: 0.1.0
-appVersion: 0.7.1
+appVersion: 0.7.2
 
 icon: https://github.com/benbusby/whoogle-search/raw/main/app/static/img/favicon/favicon-96x96.png
 

misc/instances.txt

@@ -1,7 +1,8 @@
 https://gowogle.voring.me
-https://s.alefvanoon.xyz
+https://s.tokhmi.xyz
 https://search.albony.xyz
 https://search.garudalinux.org
+https://search.dr460nf1r3.org
 https://search.sethforprivacy.com
 https://whoogle.fossho.st
 https://whooglesearch.net

setup.cfg

@@ -18,6 +18,7 @@ packages = find:
 include_package_data = True
 install_requires=
     beautifulsoup4
+    cssutils
     cryptography
     defusedxml
     Flask

setup.py

@@ -5,4 +5,4 @@
 if os.getenv('DEV_BUILD'):
     optional_dev_tag = '.dev' + os.getenv('DEV_BUILD')
 
-setuptools.setup(version='0.7.1' + optional_dev_tag)
+setuptools.setup(version='0.7.2' + optional_dev_tag)