chore: merge updates from main into feat/bs5 branch

.github/workflows/dev-db-nightly.yml

@@ -7,9 +7,17 @@ name: Nightly Dev DB Image
 
 # Controls when the workflow will run
 on:
+  # Run every night
   schedule:
     - cron: '0 0 * * *'
 
+  # Run on db.Dockerfile changes
+  push:
+    branches:
+      - main
+    paths:
+      - 'docker/db.Dockerfile'
+
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 

dev/docker-test-base/Dockerfile

@@ -0,0 +1,123 @@
+FROM python:3.6-bullseye
+LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+
+RUN apt-get update
+RUN apt-get -qy upgrade
+
+# Add Node.js Source
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
+
+# Add Docker Source
+RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
+    $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+# Install the packages we need
+RUN apt-get update
+RUN apt-get install -qy \
+	apache2-utils \
+	apt-file \
+	apt-utils \
+	bash \
+	build-essential \
+	curl \
+    docker-ce-cli \
+	enscript \
+	gawk \
+	gcc \
+	ghostscript \
+	git \
+	gnupg \
+	graphviz \
+	jq \
+	less \
+    libcairo2-dev \
+    libgtk2.0-0 \
+    libgtk-3-0 \
+    libnotify-dev \
+    libgconf-2-4 \
+    libgbm-dev \
+    libnss3 \
+    libxss1 \
+    libasound2 \
+    libxtst6 \
+	libmagic-dev \
+	libmariadb-dev \
+	libtidy-dev \
+	locales \
+	mariadb-client \
+    netcat \
+    nodejs \
+	pigz \
+	pv \
+	python3-ipython \
+	ripgrep \
+	rsync \
+	rsyslog \
+    ruby \
+    ruby-rubygems \
+	unzip \
+	wget \
+    xauth \
+    xvfb \
+    yang-tools
+
+# Install kramdown-rfc2629 (ruby)
+RUN gem install kramdown-rfc2629
+
+# Install chromedriver
+COPY docker/scripts/app-install-chromedriver.sh /tmp/app-install-chromedriver.sh
+RUN sed -i 's/\r$//' /tmp/app-install-chromedriver.sh && \
+    chmod +x /tmp/app-install-chromedriver.sh
+RUN /tmp/app-install-chromedriver.sh
+
+# Get rid of installation files we don't need in the image, to reduce size
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# "fake" dbus address to prevent errors
+# https://github.com/SeleniumHQ/docker-selenium/issues/87
+ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
+
+# avoid million NPM install messages
+ENV npm_config_loglevel warn
+# allow installing when the main user is root
+ENV npm_config_unsafe_perm true
+# disable NPM funding messages
+ENV npm_config_fund false
+
+# Set locale to en_US.UTF-8
+RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment && \
+    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
+    echo "LANG=en_US.UTF-8" > /etc/locale.conf && \
+    dpkg-reconfigure locales && \
+    locale-gen en_US.UTF-8 && \
+    update-locale LC_ALL en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+
+# Install idnits
+ADD https://raw.githubusercontent.com/ietf-tools/idnits-mirror/main/idnits /usr/local/bin/
+RUN chmod +rx /usr/local/bin/idnits
+
+# Install current datatracker python dependencies
+COPY requirements.txt /tmp/pip-tmp/
+RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
+    && rm -rf /tmp/pip-tmp
+
+# Turn off rsyslog kernel logging (doesn't work in Docker)
+RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
+
+# Fetch wait-for utility
+ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
+RUN chmod +rx /usr/local/bin/wait-for
+
+# Create workspace
+RUN mkdir -p /workspace
+WORKDIR /workspace
+
+# Install NPM modules
+COPY package.json package.json
+RUN npm install --no-audit
+RUN rm -f package.json package-lock.json

ietf/release/tests.py

@@ -11,8 +11,6 @@
 from ietf.utils.test_utils import TestCase
 
 class ReleasePagesTest(TestCase):
-
-
     def test_about(self):
         url = reverse('ietf.release.views.release')+"about"
         r = self.client.get(url)

ietf/submit/forms.py

@@ -33,7 +33,7 @@
 from ietf.message.models import Message
 from ietf.name.models import FormalLanguageName, GroupTypeName
 from ietf.submit.models import Submission, Preapproval
-from ietf.submit.utils import validate_submission_name, validate_submission_rev, validate_submission_document_date
+from ietf.submit.utils import validate_submission_name, validate_submission_rev, validate_submission_document_date, remote_ip
 from ietf.submit.parsers.pdf_parser import PDFParser
 from ietf.submit.parsers.plain_parser import PlainParser
 from ietf.submit.parsers.xml_parser import XMLParser
@@ -47,7 +47,7 @@ class SubmissionBaseUploadForm(forms.Form):
     def __init__(self, request, *args, **kwargs):
         super(SubmissionBaseUploadForm, self).__init__(*args, **kwargs)
 
-        self.remote_ip = request.META.get('REMOTE_ADDR', None)
+        self.remote_ip = remote_ip(request)
 
         self.request = request
         self.in_first_cut_off = False

ietf/submit/utils.py

@@ -1030,3 +1030,12 @@ def update_submission_external_resources(submission, new_resources):
     for new_res in new_resources:
         new_res.submission = submission
         new_res.save()
+
+def remote_ip(request):
+    if 'CF-Connecting-IP' in request.META:
+        remote_ip = request.META.get('CF-Connecting-IP')
+    elif 'X-Forwarded-For' in request.META:
+        remote_ip = request.META.get('X-Forwarded-For').split(',')[0]
+    else:
+        remote_ip = request.META.get('REMOTE_ADDR', None)
+    return remote_ip

ietf/submit/views.py

@@ -39,7 +39,7 @@
     post_submission, cancel_submission, rename_submission_files, remove_submission_files, get_draft_meta,
     get_submission, fill_in_submission, apply_checkers, save_files, 
     check_submission_revision_consistency, accept_submission, accept_submission_requires_group_approval,
-    accept_submission_requires_prev_auth_approval, update_submission_external_resources )
+    accept_submission_requires_prev_auth_approval, update_submission_external_resources, remote_ip )
 from ietf.stats.utils import clean_country_name
 from ietf.utils.accesstoken import generate_access_token
 from ietf.utils.log import log
@@ -729,7 +729,7 @@ def add_manualpost_email(request, submission_id=None, access_token=None):
 
                 submission, submission_email_event = (
                     add_submission_email(request=request,
-                                         remote_ip=request.META.get('REMOTE_ADDR', None),
+                                         remote_ip=remote_ip(request),
                                          name = form.draft_name,
                                          rev=form.revision,
                                          submission_pk = submission_pk,

ietf/templates/base.html

@@ -152,4 +152,4 @@
             });
         </script>
     </body>
-</html>
+</html>

ietf/templates/base/menu.html

@@ -420,4 +420,4 @@
 {% endif %}
 {% if flavor == 'top' %}
     {% include "base/menu_user.html" %}
-{% endif %}
+{% endif %}