From 213acc016ab00da85e29b629138f46d93e21df96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Wed, 23 Dec 2020 19:39:20 +0100
Subject: [PATCH] Bugfix
---
.gitlab-ci.yml | 2 +-
lib/PiTube/Controller/Nginx.pm | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b1113b..bcfb00e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: docker:19.03.1
variables:
DOCKER_TLS_CERTDIR: "/certs"
IMAGE_TAG: $CI_REGISTRY_IMAGE
- IMAGE_VER: 1.5.0
+ IMAGE_VER: 1.5.1
services:
- docker:19.03.1-dind
diff --git a/lib/PiTube/Controller/Nginx.pm b/lib/PiTube/Controller/Nginx.pm
index 82a6c1b..f5a0fc4 100644
--- a/lib/PiTube/Controller/Nginx.pm
+++ b/lib/PiTube/Controller/Nginx.pm
@@ -89,9 +89,10 @@ sub callback_hls {
my $code = 403;
if ($c->req->headers->header('X-Original-URI') =~ HLS ) {
- $code = 204 if $c->session->{user}{acl}{ $1 } & 4;
-
- if (! $code) {
+ if ( $c->session->{user} ) {
+ $code = 204 if $c->session->{user}{acl}{ $1 } & 4;
+ }
+ else {
my $is_public = $c->schema->resultset('Stream')->count({
key => $1, is_public => 't'
});
--
GitLab