Skip to content

add NO_AUTH and PATH_PREFIX variables #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

add NO_AUTH and PATH_PREFIX variables #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e33f186
Travis build tcoupin/picamera image
tcoupin Dec 27, 2018
1a53be5
add PATH_PREFIX env var
tcoupin Dec 30, 2018
846970e
add NO_AUTH env var
tcoupin Dec 30, 2018
344996e
Fix redirect when no trailing /
tcoupin Dec 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
sudo: required
services:
- docker
env:
- DOCKER_IMAGE=pschmitt/picamera
script:
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
- docker run --rm --privileged multiarch/qemu-user-static:register --reset
Expand Down
26 changes: 16 additions & 10 deletions web_streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,22 @@


# Parameters
NO_AUTH = os.environ.get('NO_AUTH', 'false').lower() == 'true'
AUTH_USERNAME = os.environ.get('AUTH_USERNAME', 'pi')
AUTH_PASSWORD = os.environ.get('AUTH_PASSWORD', 'picamera')
AUTH_BASE64 = base64.b64encode('{}:{}'.format(
AUTH_USERNAME, AUTH_PASSWORD).encode('utf-8'))
BASIC_AUTH = 'Basic {}'.format(AUTH_BASE64.decode('utf-8'))
RESOLUTION = os.environ.get('RESOLUTION', '800x600').split('x')
RESOLUTION_X = int(RESOLUTION[0])
RESOLUTION_Y = int(RESOLUTION[1])
FRAMERATE = int(os.environ.get('FRAMERATE', '24'))
ROTATION = int(os.environ.get('ROTATE', 0))
HFLIP = os.environ.get('HFLIP', 'false').lower() == 'true'
VFLIP = os.environ.get('VFLIP', 'false').lower() == 'true'
PATH_PREFIX = os.environ.get('PATH_PREFIX','')

AUTH_BASE64 = base64.b64encode('{}:{}'.format(
AUTH_USERNAME, AUTH_PASSWORD).encode('utf-8'))
BASIC_AUTH = 'Basic {}'.format(AUTH_BASE64.decode('utf-8'))
RESOLUTION_X = int(RESOLUTION[0])
RESOLUTION_Y = int(RESOLUTION[1])


PAGE = """\
<html>
Expand Down Expand Up @@ -55,7 +59,9 @@ def write(self, buf):

class StreamingHandler(server.BaseHTTPRequestHandler):
def do_GET(self):
if self.headers.get('Authorization') is None:
if NO_AUTH:
self.authorized_get()
elif self.headers.get('Authorization') is None:
self.do_AUTHHEAD()
self.wfile.write(b'no auth header received')
elif self.headers.get('Authorization') == BASIC_AUTH:
Expand All @@ -71,18 +77,18 @@ def do_AUTHHEAD(self):
self.end_headers()

def authorized_get(self):
if self.path == '/':
if self.path == PATH_PREFIX + '/' or self.path == PATH_PREFIX:
self.send_response(301)
self.send_header('Location', '/index.html')
self.send_header('Location', PATH_PREFIX + '/index.html')
self.end_headers()
elif self.path == '/index.html':
elif self.path == PATH_PREFIX + '/index.html':
content = PAGE.encode('utf-8')
self.send_response(200)
self.send_header('Content-Type', 'text/html')
self.send_header('Content-Length', len(content))
self.end_headers()
self.wfile.write(content)
elif self.path == '/stream.mjpg':
elif self.path == PATH_PREFIX + '/stream.mjpg':
self.send_response(200)
self.send_header('Age', 0)
self.send_header('Cache-Control', 'no-cache, private')
Expand Down