Merge branch 'v1' into debian-12-migration

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve Exodus
+title: "[Bug] "
+labels: ["bug", "to confirm"]
+assignees: ""
+---
+
+## Describe the bug
+
+A clear and concise description of what the bug is. Add some log extract (if this bug concern your own local Exodus install) so we can see what is happening. Don't forget to add some context.
+
+## To Reproduce
+
+Steps to reproduce the issue.
+
+## Expected behavior
+
+A description of what you expected to happen.
+
+## Version details
+
+If this bug concern your own local Exodus install please specify the following versions, otherwise you can delete this section.
+
+- OS: [e.g. Debian 12, OSX]
+- Exodus version: [e.g. `1.28.3`]
+
+## Install method
+
+If this bug concern your own local Exodus install please specify your install method, otherwise you can delete this section.
+
+How did you install Exodus? via Docker? From Pip?

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature] "
+labels: ["enhancement", "to confirm"]
+assignees: ""
+---
+
+## Is your feature request related to a problem? Please describe
+
+A clear and concise description of what the problem is. Eg. I'm always frustrated when […]
+
+## Describe the solution you'd like
+
+A clear description of what you want to happen.
+
+## Describe alternatives you've considered
+
+A description of any alternative solutions or features you've considered.
+
+## Additional context
+
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,11 @@
+---
+name: Question
+about: Ask a question about using the software
+title: "[Question] "
+labels: ["question"]
+assignees: ""
+---
+
+Please, feel free to ask your question here (you can also ask your question [via email or IRC](https://exodus-privacy.eu.org/en/page/who/#contact)).
+
+Please note that we're all volunteers and there might be some delay before an answer comes.

.github/workflows/main.yml

@@ -108,3 +108,16 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+  djhtml:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Install djhtml
+        run: python -m pip install --upgrade pip djhtml
+      - name: Lint HTML files
+        run: djhtml . --check

Pipfile

@@ -13,7 +13,7 @@ django-environ = "~=0.9.0"
 django-eventlog = "==1.1"
 django-minio-storage = "~=0.3.10"
 djangorestframework = "~=3.13.1"
-exodus-core = "==1.3.9"
+exodus-core = "==1.3.10"
 google-play-scraper = "~=1.2.2"
 gunicorn = "~=20.1"
 mistune = "~=0.8"
@@ -24,4 +24,5 @@ whitenoise = "~=6.2.0"
 
 [dev-packages]
 autopep8 = "~=1.6"
+django-csp = "~=3.7"
 flake8 = "~=4.0"

docker/Dockerfile

@@ -57,7 +57,7 @@ RUN ln -s /usr/lib/ssl/certs /opt/openssl/certs
 WORKDIR /opt
 
 COPY ./Pipfile* /opt/
-RUN pipenv install --ignore-pipfile --system
+RUN pipenv install --ignore-pipfile --system --dev
 
 WORKDIR /exodus/exodus
 

exodus/analysis_query/templates/queries_list.html

@@ -1,47 +1,47 @@
 {% extends "base/base.html"%}
 {% load i18n %}
 {% block content %}
-<div class="row justify-content-md-center">
-  <div class="col-lg-10 col-centered">
-    {% if request.user.is_superuser %}
-      <table class="table table-hover">
-        {% for q in queries %}
-          <tr>
-            <td>
-              <a href="{% url 'analysis:wait' q.id %}">{{ q.id }}</a>
-            </td>
-            <td>
-              {% if q.source == 'fdroid' %}
-                <a target="_blank" rel="noreferrer" href="https://f-droid.org/packages/{{ q.handle }}">{{ q.handle | truncatechars_html:40 }}</a>
-              {% else %}
-                <a target="_blank" rel="noreferrer" href="https://play.google.com/store/apps/details?id={{ q.handle }}">{{ q.handle | truncatechars_html:40 }}</a>
-              {% endif %}
-            </td>
-            <td>
-              {{ q.source }}
-            </td>
-            <td>
-              {{ q.uploaded_at }}
-            </td>
-            <td>
-              {% if q.processed %}
-                {% if q.in_error %}
-                  <span class="text-danger" data-toggle="tooltip" title="{{ q.description }}">error</span>
+  <div class="row justify-content-md-center">
+    <div class="col-lg-10 col-centered">
+      {% if request.user.is_superuser %}
+        <table class="table table-hover">
+          {% for q in queries %}
+            <tr>
+              <td>
+                <a href="{% url 'analysis:wait' q.id %}">{{ q.id }}</a>
+              </td>
+              <td>
+                {% if q.source == 'fdroid' %}
+                  <a target="_blank" rel="noreferrer" href="https://f-droid.org/packages/{{ q.handle }}">{{ q.handle | truncatechars_html:40 }}</a>
                 {% else %}
-                  <span class="text-success">complete</span>
+                  <a target="_blank" rel="noreferrer" href="https://play.google.com/store/apps/details?id={{ q.handle }}">{{ q.handle | truncatechars_html:40 }}</a>
                 {% endif %}
-              {% else %}
-                <span class="text-warning">in progress</span>
-              {% endif %}
-            </td>
-          </tr>
-        {% endfor %}
-      </table>
-    {% else %}
-      <div class="alert alert-danger small">
-        <strong>{% trans "You need to be registered" %}.</strong>
-      </div>
-    {% endif %}
+              </td>
+              <td>
+                {{ q.source }}
+              </td>
+              <td>
+                {{ q.uploaded_at }}
+              </td>
+              <td>
+                {% if q.processed %}
+                  {% if q.in_error %}
+                    <span class="text-danger" data-toggle="tooltip" title="{{ q.description }}">error</span>
+                  {% else %}
+                    <span class="text-success">complete</span>
+                  {% endif %}
+                {% else %}
+                  <span class="text-warning">in progress</span>
+                {% endif %}
+              </td>
+            </tr>
+          {% endfor %}
+        </table>
+      {% else %}
+        <div class="alert alert-danger small">
+          <strong>{% trans "You need to be registered" %}.</strong>
+        </div>
+      {% endif %}
+    </div>
   </div>
-</div>
 {% endblock %}