Compare commits

...

4 Commits

Author SHA1 Message Date
Lamp d5ead66a07 rename env 2023-08-15 11:35:48 -07:00
Lamp f8436927cf use env for caddy site 2023-08-15 11:34:02 -07:00
Lamp 3b4ee632b1 why do I have log template but then don't log 2023-08-15 11:29:30 -07:00
Lamp 6b868c2b63 Disable PC vrchat bypass 2023-08-15 11:26:52 -07:00
4 changed files with 19 additions and 19 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
.vscode .vscode
__pycache__ __pycache__
test.mp4 test.mp4
secrets.env env

View File

@ -13,8 +13,8 @@
} }
} }
:80 { {$CADDY_SITE:":80"} {
#nl.u2b.cx u2b.cx { log
tls { tls {
dns porkbun { dns porkbun {
api_key {env.PORKBUN_API_KEY} api_key {env.PORKBUN_API_KEY}

View File

@ -22,7 +22,7 @@ services:
- ./caddy/Caddyfile:/etc/caddy/Caddyfile - ./caddy/Caddyfile:/etc/caddy/Caddyfile
- caddy_data:/data - caddy_data:/data
- caddy_config:/config - caddy_config:/config
env_file: secrets.env env_file: env
volumes: volumes:
caddy_data: caddy_data:
caddy_config: caddy_config:

View File

@ -26,10 +26,10 @@ class Handler(BaseHTTPRequestHandler):
def address_string(self): def address_string(self):
return getattr(self, 'headers', {}).get('X-Forwarded-For', '').split(',')[0] or self.client_address[0] return getattr(self, 'headers', {}).get('X-Forwarded-For', '').split(',')[0] or self.client_address[0]
def is_pc_vrchat(self): #def is_pc_vrchat(self):
ua = self.headers.get('User-Agent', '') # ua = self.headers.get('User-Agent', '')
ae = self.headers.get('Accept-Encoding', '') # ae = self.headers.get('Accept-Encoding', '')
return ua.startswith("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/") and ua.endswith(" Safari/537.36") and ae == "identity" # return ua.startswith("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/") and ua.endswith(" Safari/537.36") and ae == "identity"
def send_error(self, code, message=""): def send_error(self, code, message=""):
body = bytes(message, "utf-8") body = bytes(message, "utf-8")
@ -48,11 +48,11 @@ class Handler(BaseHTTPRequestHandler):
path = unquote(self.path) path = unquote(self.path)
match = re.match("\/(?:id\/|(?:https?:\/\/)?(?:(?:www\.|music\.|m\.)?youtube\.com\/(?:watch\?v=|shorts\/)|youtu\.be\/))([A-Za-z0-9_-]{11})", path) match = re.match("\/(?:id\/|(?:https?:\/\/)?(?:(?:www\.|music\.|m\.)?youtube\.com\/(?:watch\?v=|shorts\/)|youtu\.be\/))([A-Za-z0-9_-]{11})", path)
if match: if match:
if self.is_pc_vrchat(): #if self.is_pc_vrchat():
self.send_response(302) # self.send_response(302)
self.send_header("Location", "https://www.youtube.com/watch?v=" + match[1]) # self.send_header("Location", "https://www.youtube.com/watch?v=" + match[1])
self.end_headers() # self.end_headers()
return # return
query = match[1] query = match[1]
else: else:
query = "ytsearch:" + path[1:] query = "ytsearch:" + path[1:]
@ -103,12 +103,12 @@ class Handler(BaseHTTPRequestHandler):
elif 'url' not in ctx: elif 'url' not in ctx:
ctx['event'].wait(60) ctx['event'].wait(60)
if self.is_pc_vrchat(): #if self.is_pc_vrchat():
if ctx.get('id'): # if ctx.get('id'):
self.send_response(302) # self.send_response(302)
self.send_header("Location", "https://www.youtube.com/watch?v=" + ctx['id']) # self.send_header("Location", "https://www.youtube.com/watch?v=" + ctx['id'])
self.end_headers() # self.end_headers()
return # return
if not ctx.get('url'): if not ctx.get('url'):
if 'exception' in ctx: if 'exception' in ctx: