Merge branch 'dev' into dependabot/pip/pytest-8.1.1

.github/workflows/docker-image-dev.yml

@@ -23,7 +23,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ github.actor }}/wifi_db
+          images: ${{ github.repository }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1 
@@ -38,7 +38,7 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/wifi_db:dev
+          tags: ${{ github.repository }}:dev
 
       - name: Login to GitHub Container Registry
         run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
@@ -51,4 +51,4 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/${{ github.actor }}/wifi_db:dev
+          tags: ghcr.io/${{ github.repository }}:dev

.github/workflows/docker-image.yml

@@ -25,7 +25,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ github.actor }}/wifi_db
+          images: ${{ github.repository }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1 
@@ -54,5 +54,5 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/${{ github.actor }}/wifi_db:latest, ghcr.io/${{ steps.meta.outputs.tags }}
+          tags: ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -4,24 +4,27 @@ FROM ubuntu:22.04 as hcxtools-builder
 WORKDIR /app
 
 RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install python3-pip make git zlib1g-dev  -y \
-    && apt-get install pkg-config libcurl4-openssl-dev libssl-dev zlib1g-dev make gcc -y \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends python3-pip make git zlib1g-dev -y \
+    && apt-get install --no-install-recommends pkg-config libcurl4-openssl-dev libssl-dev zlib1g-dev make gcc -y \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Clone hcxtools and install
-RUN git clone -b 6.3.1 https://github.com/ZerBea/hcxtools.git /app/hcxtools \
-    && cd /app/hcxtools \
-    && make \
-    && make install \
-    && cd /app \
-    && rm -rf /app/hcxtools
+RUN git clone -b 6.3.1 https://github.com/ZerBea/hcxtools.git /app/hcxtools
+
+WORKDIR /app/hcxtools
+RUN make \
+    && make install
+
+WORKDIR /app
+RUN rm -rf /app/hcxtools
 
 FROM ubuntu:22.04
 
 WORKDIR /app
 
 # Install dependencies
 ENV DEBIAN_FRONTEND noninteractive
+
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get update && apt-get install -y --no-install-recommends python3-pip tshark git libcurl4-openssl-dev libssl-dev -y \
     && apt-get clean && rm -rf /var/lib/apt/lists/* 
 
@@ -30,8 +33,8 @@ COPY --from=hcxtools-builder /usr/bin/hcx* /usr/bin/
 
 
 # Copy and install Python dependencies
-RUN python3 -m pip install --no-cache-dir -U pip \
-    && python3 -m pip install --no-cache-dir pytest
+
+RUN python3 -m pip install --no-cache-dir --upgrade pip==20.0.2
 
 COPY requirements.txt requirements.txt
 RUN pip3 install --no-cache-dir -r requirements.txt

utils/oui.py

@@ -45,7 +45,7 @@ def load_vendors():
                             "Sec-Fetch-Mode": "navigate",
                             "Sec-Fetch-Site": "none", "Sec-Fetch-User": "?1",
                             "Te": "trailers"}
-                response = requests.get(url, headers=headersR)
+                response = requests.get(url, headers=headersR, timeout=5)
                 tmp.write(response.content)
                 tmp.seek(0)
 

utils/update.py

@@ -18,7 +18,7 @@ def is_git_installed():
 
 def get_latest_github_release(repo_url):
     try:
-        response = requests.get(f"{repo_url}/releases/latest")
+        response = requests.get(f"{repo_url}/releases/latest", timeout=5)
         if response.status_code == 200:
             latest_release_tag = response.json()["tag_name"]
             return latest_release_tag

wifi_db.py

@@ -18,7 +18,7 @@
 # import nest_asyncio ; nest_asyncio.apply() ->
 # Fix RuntimeError: This event loop is already running”
 
-VERSION = '1.5'
+VERSION = '1.5.1'
 
 
 def banner():