Merge pull request #30 from luigi311/dev

Add ssl_bypass to skip hostname validation.

.env.sample

@@ -24,7 +24,8 @@ PLEX_TOKEN = "SuperSecretToken"
 #PLEX_USERNAME = ""
 #PLEX_PASSWORD = ""
 #PLEX_SERVERNAME = "Plex Server"
-
+## Skip hostname validation for ssl certificates.
+SSL_BYPASS = "False"
 
 ## Jellyfin server URL, use hostname or IP address if the hostname is not resolving correctly
 ## Comma seperated list for multiple servers

.github/workflows/codeql.yml

@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: "23 20 * * 6"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ python ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

Dockerfile

@@ -27,6 +27,12 @@ ENV WHITELIST_USERS  ''
 
 WORKDIR /app
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        build-essential && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
 COPY ./requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 

src/plex.py

@@ -1,4 +1,5 @@
 import re, requests
+from urllib3.poolmanager import PoolManager
 
 from plexapi.server import PlexServer
 from plexapi.myplex import MyPlexAccount
@@ -11,6 +12,14 @@ from src.functions import (
     future_thread_executor,
 )
 
+# Bypass hostname validation for ssl. Taken from https://github.com/pkkid/python-plexapi/issues/143#issuecomment-775485186
+class HostNameIgnoringAdapter(requests.adapters.HTTPAdapter):
+    def init_poolmanager(self, connections, maxsize, block=..., **pool_kwargs):
+        self.poolmanager = PoolManager(num_pools=connections,
+                                       maxsize=maxsize,
+                                       block=block,
+                                       assert_hostname=False,
+                                       **pool_kwargs)
 
 def get_user_watched(user, user_plex, library):
     try:
@@ -252,20 +261,22 @@ class Plex:
         self.username = username
         self.password = password
         self.servername = servername
-        self.plex = self.login(ssl_bypass)
+        self.ssl_bypass = ssl_bypass
+        self.plex = self.login(self.baseurl, self.token, ssl_bypass)
         self.admin_user = self.plex.myPlexAccount()
         self.users = self.get_users()
 
-    def login(self, ssl_bypass=False):
+    def login(self, baseurl, token, ssl_bypass=False):
         try:
-            if self.baseurl and self.token:
+            if baseurl and token:
                 # Login via token
                 if ssl_bypass:
                     session = requests.Session()
-                    session.verify = False
-                    plex = PlexServer(self.baseurl, self.token, session=session)
+                    # By pass ssl hostname check https://github.com/pkkid/python-plexapi/issues/143#issuecomment-775485186
+                    session.mount("https://", HostNameIgnoringAdapter())
+                    plex = PlexServer(baseurl, token, session=session)
                 else:
-                    plex = PlexServer(self.baseurl, self.token)
+                    plex = PlexServer(baseurl, token)
             elif self.username and self.password and self.servername:
                 # Login via plex account
                 account = MyPlexAccount(self.username, self.password)
@@ -312,8 +323,8 @@ class Plex:
                 if self.admin_user == user:
                     user_plex = self.plex
                 else:
-                    user_plex = PlexServer(
-                        self.plex._baseurl, user.get_token(self.plex.machineIdentifier)
+                    user_plex = self.login(
+                        self.plex._baseurl, user.get_token(self.plex.machineIdentifier), self.ssl_bypass
                     )
 
                 libraries = user_plex.library.sections()