Login

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

@@ -0,0 +1,40 @@
+name: DEV docker image auto build
+
+on:
+  push:
+    branches: [ "dev" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+
+    - name: Login to DockerHub
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Build and push
+      id: docker_build
+      uses: docker/build-push-action@v2
+      with:
+        context: ./
+        file: ./Dockerfile
+        platform: linux/arm/v7,linux/arm/v6,linux/arm64
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: moebiuss/noip-renew:dev
+
+    - name: Image digest
+      run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/docker-image.yml

@@ -0,0 +1,57 @@
+name: Docker Image CI
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Prepare
+      id: prep
+      run: |
+        DOCKER_IMAGE=moebiuss/noip-renew
+        VERSION=edge
+        if [[ $GITHUB_REF == refs/tags/* ]]; then
+          VERSION=${GITHUB_REF#refs/tags/v}
+        fi
+        if [ "${{ github.event_name }}" = "schedule" ]; then
+          VERSION=nightly
+        fi
+        TAGS="${DOCKER_IMAGE}:${VERSION}"
+        if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+          TAGS="$TAGS,${DOCKER_IMAGE}:latest"
+        fi
+        echo ::set-output name=tags::${TAGS}
+
+    - name: Login to DockerHub
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Build and push
+      id: docker_build
+      uses: docker/build-push-action@v2
+      with:
+        context: ./
+        platforms: linux/amd64,linux/arm64,linux/arm
+        file: ./Dockerfile
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.prep.outputs.tags }}
+
+    - name: Image digest
+      run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

@@ -99,6 +99,12 @@ ENV/
 
 # mypy
 .mypy_cache/
-debug1.png
-debug2.png
+
+.bash_history
+.pki
+.wget-hsts
+*success.png
+exception.png
+debug*.png
 results.png
+vps_mon.py

Dockerfile

@@ -1,19 +1,18 @@
 FROM debian
 LABEL maintainer="loblab"
 
-#ARG TZ=Asia/Shanghai
-#ARG APT_MIRROR=mirrors.163.com
 ARG DEBIAN_FRONTED=noninteractive
 ARG PYTHON=python3
 
-#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-#RUN sed -i "s/deb.debian.org/$APT_MIRROR/" /etc/apt/sources.list
+ENV CONTAINER=1
+
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get -y install chromium-chromedriver || \
     apt-get -y install chromium-driver || \
     apt-get -y install chromedriver
 RUN apt-get -y install ${PYTHON}-pip
-RUN $PYTHON -m pip install selenium
+RUN apt-get -y install ${PYTHON}-selenium
+RUN apt-get -y install ${PYTHON}-pyotp
 RUN apt-get -y install curl wget
 
 RUN mkdir -p /home/loblab && \
@@ -22,4 +21,4 @@ RUN mkdir -p /home/loblab && \
 USER loblab
 WORKDIR /home/loblab
 COPY /noip-renew.py /home/loblab/
-ENTRYPOINT ["python3", "/home/loblab/noip-renew.py"]
+ENTRYPOINT ["python3", "/home/loblab/noip-renew.py"]

README.md

@@ -1,24 +1,39 @@
+[![Docker Image CI](https://github.com/neothematrix/noip-renew/actions/workflows/docker-image.yml/badge.svg)](https://github.com/neothematrix/noip-renew/actions/workflows/docker-image.yml)
+
 # Script to auto renew/confirm noip.com free hosts
 
 [noip.com](https://www.noip.com/) free hosts expire every month.
 This script auto clicks web pages to renew the hosts,
 using Python/Selenium with Chrome headless mode.
 
-- Platform: Debian/Ubuntu/Raspbian/Arch Linux, no GUI needed (tested on Debian 9.x/10.x/Arch Linux); python 3.6+
-- Ver: 1.2
+NOTE: this is an up-to-date fork of loblab/noip-renew repository as it seems it's not anymore actively developed, I'll try to keep this fork up to date and working as much as possible. Feel free to contribute!
+
+- Platform: Debian/Ubuntu/Raspbian/Arch Linux, no GUI needed (tested on Debian 9.x/10.x/11.x/Arch Linux); python 3.5+
+- Chrome webdriver - tested up to version 120.0.6099.102-rpt1
+- Selenium - v.3.x (python 3.5+); v. 4.0.0 (python 3.7+); v.4.10.0 and above (python 3.8+); Tested up to v. 4.17.2
 - Ref: [Technical explanation for the code (Chinese)](http://www.jianshu.com/p/3c8196175147)
-- Updated: 1/2/2021
 - Created: 11/04/2017
-- Author: loblab
-- Contributor: [IDemixI](https://www.github.com/IDemixI)
+- Original Author: loblab
+- Fork Mantainer: neothematrix
+- Contributors: [Angel0ffDeath](https://github.com/Angel0ffDeath), [benyjr](https://github.com/benyjr)
 
 ![noip.com hosts](https://raw.githubusercontent.com/loblab/noip-renew/master/screenshot.png)
 
+## Prerequisites
+
+ENABLE 2FA authentication on your account and save the 2FA Secret key that is shared only once when you activate it
+
+ChromeDriver is required for the script to interface with noip.com from within the script.
+ChromeDriver must be maintained to match the installed version of Chrome.
+There is no automated repository that provides ChromeDriver package beyond Ubuntu 18 LTS.
+Installing Chromium via Snap and then linking chromedriver to /usr/bin/chromedriver should keep chromediver sufficiently up to date without manual intervention
+
 ## Usage
 
-1. Clone this repository to the device you will be running it from. (`git clone https://github.com/loblab/noip-renew.git`)
+1. Clone this repository to the device you will be running it from. (`git clone https://github.com/neothematrix/noip-renew.git`)
 2. Run setup.sh and set your noip.com account information,
-3. Run noip-renew-USERNAME command.
+3. If you want to use randomized cronjob answer y to the question and give time interval hours, i.e. 7-18 (for instance). This will give a window from 7:00 to 18:59; Take into account it is possible script to try to run on days on which Daylight Saving Time (DST) occurs (if you have such thing in your country), so avoid hours in which this event occurs, otherwise the scrippt may not run. For instance in Europe DST events are last Sundays of March and October at 3AM (March) or 4AM (October). Script probably will not run on the DST day in March if scheduled between 3 and 4 AM. It is too complicated to incorporate such logic, but if someone would like then try.
+4. Run noip-renew-USERNAME command.
 
 Check confirmed records from multiple log files:
 
@@ -27,36 +42,24 @@ grep -h Confirmed *.log | grep -v ": 0" | sort
 ```
 ## Usage with Docker
 
-For docker users, run the following:
+For docker users you need to define the following ENV variables:
+
+```
+'NOIP_USERNAME = <your username>'
+'NOIP_PASSWORD = <your password (plain not base64 encoded)>'
+'NOIP_2FA_SECRET_KEY = <your 2FA secret key that appeared when you setup 2FA>'
+NOIP_DEBUG = <optional, defaults to 1>
+```
+
+so you can run the following:
 ```sh
-my_username='add username here'
-my_password='add password here'
-my_host_num='add number of hosts here'
-debug_lvl=2
-docker build -t loblab/selenium:debian .
-echo -e "$(crontab -l)"$'\n'"12  3  *  *  1,3,5  docker run --network host loblab/selenium:debian ${my_username} ${my_password} ${my_host_num} ${debug_lvl}" | crontab -
+echo -e "$(crontab -l)"$'\n'"12  3  *  *  1,3,5  docker run --rm --network host -e 'NOIP_USERNAME=<your_username>' -e 'NOIP_PASSWORD=<your_password>' -e 'NOIP_2FA_SECRET_KEY=<your 2fa secret key>' -e NOIP_DEBUG=2 moebiuss/noip-renew" | crontab -
 ```
+NOTE: with newer versions of ChromeDriver (>v99) you might need to increase the shm size of the container otherwise ChromeDriver will crash and throw an exception. To do it, you can just add the "--shm-size="512m" flag to the docker run command.
 
 ## Remarks
 
-The script is not designed to renew/update the dynamic DNS records, though the latest version does have this ability if requested.
+The script is not designed to renew/update the dynamic DNS records, but only to renew the hostnames expiring every 30 days due to the free tier.
 Check [noip.com documentation](https://www.noip.com/integrate) for that purpose.
 Most wireless routers support noip.com. For more information, check [here](https://www.noip.com/support/knowledgebase/what-devices-support-no-ips-dynamic-dns-update-service/).
 You can also check [DNS-O-Matic](https://dnsomatic.com/) to update multiple noip.com DNS records.
-
-If you need notification functionality, please try [IDemixI's branch](https://github.com/IDemixI/noip-renew/tree/notifications).
-
-## History
-- 1.2 (01/02/2021): Merged all pull requests in latest months: make it work for updated noip.com site.
-- 1.1 (06/05/2020): Fixed error when attempting to update an expired host.
-- 1.0 (05/18/2020): Minor fixes to an xpath & a try catch pass to avoid an exception. Also fixed versioning.
-- 1.0 (04/16/2020): Catches "Would you like to upgrade?" page & stops script accordingly. Manual intervention still required.
-- 0.9 (04/13/2020): Complete refactor of code, more stability & automatic crontab scheduling.
-- 0.8 (03/23/2020): Added menu to repair/install/remove script along with ability to update noip.com details.
-- 0.7 (03/21/2020): Code tidyup and improved efficiency (Removed number of hosts and automatically get this)
-- 0.6 (03/15/2020): Improved support for Raspberry Pi (Raspbian Buster) & Changes to setup script.
-- 0.5 (01/05/2020): Support raspberry pi, try different "chromedriver" packages in setup script.
-- 0.4 (01/14/2019): Add num_hosts argument, change for button renaming; support user agent.
-- 0.3 (05/19/2018): Support Docker, ignore timeout, support proxy, tested on python3.
-- 0.2 (11/12/2017): Deploy the script as normal user only. root user with 'no-sandbox' option is not safe for Chrome.
-- 0.1 (11/05/2017): Support Debian with Chrome headless.

noip-renew-skd.sh

@@ -1,11 +1,13 @@
 #!/bin/bash
+Min=30
+Hour=0
 USER=
 SUDO=sudo
 LOGDIR=/var/log/noip-renew/$USER
 INSTDIR=/usr/local/bin
-INSTEXE=$INSTDIR/noip-renew-$USER
-CRONJOB="30 0 * * *   $USER    $INSTEXE $LOGDIR"
-NEWCJOB="30 0 $1 $2 *   $USER    $INSTEXE $LOGDIR"
+INSTEXE=$INSTDIR/noip-renew-$USER.sh
+CRONJOB="$Min $Hour * * *   $INSTEXE $LOGDIR"
+NEWCJOB="$Min $Hour $1 $2 *   $INSTEXE $LOGDIR"
 $SUDO crontab -u $USER -l | grep -v '/noip-renew*'  | $SUDO crontab -u $USER -
 if [[ $3 = "True" ]]; then
     ($SUDO crontab -u $USER -l; echo "$NEWCJOB") | $SUDO crontab -u $USER -