alterware/BetterTwitFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated image combine logic for checking hosts

Browse Source
This commit is contained in:
Dylan 2024-02-08 17:00:04 +00:00
parent 9493004920
commit b4a55e2a53
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
combineImg/__init__.py
View File

@ -4,6 +4,7 @@ from io import BytesIO
import base64 import base64
import concurrent.futures import concurrent.futures
from time import time as timer from time import time as timer
from urllib.parse import urlparse
# find the highest res image in an array of images # find the highest res image in an array of images
def findImageWithMostPixels(imageArray): def findImageWithMostPixels(imageArray):
@ -139,10 +140,11 @@ def lambda_handler(event, context):
"body": "Invalid request." "body": "Invalid request."
} }
images = event["queryStringParameters"].get("imgs","").split(",") images = event["queryStringParameters"].get("imgs","").split(",")
for img in images: for img in imgs:
if not img.startswith("https://pbs.twimg.com"): result = urlparse(img)
return {'statusCode':400,'body':'Invalid image URL'} if result.hostname != "pbs.twimg.com" or result.scheme != "https":
combined = genImageFromURL(images) abort(400)
combined = genImageFromURL(images)
if (combined == None): if (combined == None):
return {'statusCode':200,'body':get500ImgBase64(),'isBase64Encoded':True,'headers':{"Content-Type": "image/jpeg","Cache-Control": "public, max-age=86400"}} return {'statusCode':200,'body':get500ImgBase64(),'isBase64Encoded':True,'headers':{"Content-Type": "image/jpeg","Cache-Control": "public, max-age=86400"}}
buffered = BytesIO() buffered = BytesIO()

4
twitfix.py
View File

@ -17,6 +17,7 @@ from yt_dlp.utils import ExtractorError
import vxlogging as log import vxlogging as log
import zipfile import zipfile
import html import html
from urllib.parse import urlparse
app = Flask(__name__) app = Flask(__name__)
CORS(app) CORS(app)
user_agent="" user_agent=""
@ -360,7 +361,8 @@ def rendercombined():
abort(400) abort(400)
#check that each image starts with "https://pbs.twimg.com" #check that each image starts with "https://pbs.twimg.com"
for img in imgs: for img in imgs:
if not img.startswith("https://pbs.twimg.com"): result = urlparse(img)
if result.hostname != "pbs.twimg.com" or result.scheme != "https":
abort(400) abort(400)
finalImg= combineImg.genImageFromURL(imgs) finalImg= combineImg.genImageFromURL(imgs)
imgIo = BytesIO() imgIo = BytesIO()