Merge pull request #453 from intelowlproject/develop

1.4.2

Author: mlodic

.dockerignore

@@ -0,0 +1,18 @@
+.gitignore
+.git
+.vscode
+.lgtm.yml
+__pycache__
+venv/
+**/build
+.env
+docker/env_file_*
+docker/custom.override.yml
+**/docker-compose.*
+docs/
+frontend/node_modules
+frontend/dist
+frontend/build
+docker-compose*
+.pre-commit-config.yaml
+.ipython/

configuration/nginx/http.conf

@@ -5,7 +5,6 @@ upstream django {
 
 uwsgi_cache_path /var/cache/nginx/feeds keys_zone=feeds_cache:10m max_size=10g
                  inactive=10m use_temp_path=off;
-limit_req_zone $binary_remote_addr zone=adminlimit:10m rate=5r/m;
 
 server {
     listen 80;
@@ -21,8 +20,6 @@ server {
     }
 
     location ^~/admin {
-        limit_req zone=adminlimit;
-
         uwsgi_pass                  django;
         uwsgi_pass_header           Authorization;
         uwsgi_pass_request_headers  on;
@@ -32,7 +29,6 @@ server {
     }
 
     location ~^/api/feeds {
-        limit_req zone=adminlimit;
         uwsgi_pass                  django;
         uwsgi_pass_header           Authorization;
         uwsgi_pass_request_headers  on;

docker/.version

@@ -1 +1 @@
-REACT_APP_GREEDYBEAR_VERSION="1.4.1"
+REACT_APP_GREEDYBEAR_VERSION="1.4.2"

docker/Dockerfile

@@ -29,20 +29,22 @@ RUN mkdir -p ${LOG_PATH} \
     && apk --no-cache -U add bash py3-psycopg2 gcc python3-dev alpine-sdk linux-headers \
     && pip3 install --no-cache-dir --upgrade pip
 
+COPY requirements/project-requirements.txt $PYTHONPATH/project-requirements.txt
 WORKDIR $PYTHONPATH
+RUN pip3 install --no-cache-dir --compile -r $PYTHONPATH/project-requirements.txt
+
 COPY . $PYTHONPATH
 COPY --from=frontend-build /build /var/www/reactapp
 
 # separation is required to avoid to re-execute os installation in case of change of python requirements
-RUN pip3 install --no-cache-dir --compile -r $PYTHONPATH/requirements/project-requirements.txt \
-    && touch ${LOG_PATH}/django/api.log ${LOG_PATH}/django/api_errors.log \
+RUN touch ${LOG_PATH}/django/api.log ${LOG_PATH}/django/api_errors.log \
     && touch ${LOG_PATH}/django/greedybear.log ${LOG_PATH}/django/greedybear_errors.log \
     && touch ${LOG_PATH}/django/celery.log ${LOG_PATH}/django/celery_errors.log \
     && touch ${LOG_PATH}/django/django_errors.log ${LOG_PATH}/django/elasticsearch.log\
     && touch ${LOG_PATH}/django/authentication.log ${LOG_PATH}/django/authentication_errors.log \
     && adduser -S -H -u 2000 -D -g www-data www-data \
     && chown -R www-data:www-data ${LOG_PATH} /opt/deploy/ \
-    && rm -rf docs/ frontend/ tests/ .github/ \
+    && rm -rf docs/ frontend/ tests/ .github/ docker/hooks/ \
     && /bin/bash ./docker/watchman_install.sh \
     && apk del gcc python3-dev alpine-sdk linux-headers
 

docker/hooks/build

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+echo "display path"
+echo "$(pwd)"
+echo "display dockerfile path"
+echo $DOCKERFILE_PATH
+cd ..
+echo "display path"
+echo "$(pwd)"
+echo "current branch"
+echo "$SOURCE_BRANCH"
+
+if [[ "$SOURCE_BRANCH" == "main" ]]; then
+  echo "The branch is main, proceeding with multi-arch build"
+  docker buildx create --name multiarch --use
+  docker buildx build -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" --platform linux/arm64,linux/amd64,windows-amd64 --push .
+else
+  echo "The branch is not main, proceeding with classic build"
+  docker buildx build -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" --push .
+fi

docker/hooks/post_push

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [[ "$SOURCE_BRANCH" == "main" ]]; then
+  curl -d "text=A new production image has been pushed to Docker Hub" -d "channel=$SLACK_CHANNEL" -H "Authorization: Bearer $SLACK_TOKEN" -X POST https://slack.com/api/chat.postMessage
+fi

docker/logrotate/application

@@ -2,6 +2,7 @@
     daily
     missingok
     rotate 2
+    size 10M
     compress
     delaycompress
     notifempty

docker/logrotate/docker

@@ -2,6 +2,7 @@
     daily
     missingok
     rotate 2
+    size 10M
     compress
     delaycompress
     notifempty

docker/logrotate/nginx

@@ -2,6 +2,7 @@
     daily
     missingok
     rotate 8
+    size 1M
     compress
     delaycompress
     notifempty

greedybear/admin.py

@@ -18,7 +18,7 @@
 @admin.register(CowrieSession)
 class CowrieSessionModelAdmin(admin.ModelAdmin):
     list_display = ["session_id", "start_time", "duration", "login_attempt", "credentials", "command_execution", "interaction_count", "source"]
-    search_fields = ["source"]
+    search_fields = ["source__name"]
     raw_id_fields = ["source"]