Skip to content
New issue

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

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

Already on GitHub? # to your account

Update ubuntu to use openssh with webauthn support #54

Merged
merged 2 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion agent-forwarding-disabled/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion anomaly-exec/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion authykey/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion authypass/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion client-cert/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
6 changes: 3 additions & 3 deletions gateway-ports/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand All @@ -10,9 +10,9 @@ RUN apt-get update -y && apt-get upgrade -y && \
bb cmatrix libaa-bin \
zsh git

RUN apt-get install -y python
RUN apt-get install -y python3

ADD gateway-ports/http.py /opt/http/http.py
ADD gateway-ports/run_http.py /opt/http/run_http.py
ADD gateway-ports/entrypoint.sh /usr/bin/entrypoint.sh
ADD gateway-ports/sshd_config /etc/ssh/sshd_config
ADD keys /tmp/
Expand Down
2 changes: 1 addition & 1 deletion gateway-ports/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ touch /var/log/auth.log
chmod 666 /var/log/auth.log

echo 'Start dummy HTTP server'
python /opt/http/http.py &
python3 /opt/http/run_http.py &

echo 'Start daemon'
/usr/sbin/sshd -D
12 changes: 6 additions & 6 deletions gateway-ports/http.py → gateway-ports/run_http.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
from http.server import BaseHTTPRequestHandler, HTTPServer


class S(BaseHTTPRequestHandler):
class Handler(BaseHTTPRequestHandler):
def _set_headers(self):
self.send_response(200)
self.send_header('Content-type', 'text/html')
Expand All @@ -13,15 +13,15 @@ def do_GET(self):

def do_HEAD(self):
self._set_headers()

def do_POST(self):
self._set_headers()
self.wfile.write("<html><body><h1>POST!</h1></body></html>")
def run(server_class=HTTPServer, handler_class=S, port=80):

def run(server_class=HTTPServer, handler_class=Handler, port=80):
server_address = ('', port)
httpd = server_class(server_address, handler_class)
print 'Starting httpd...'
print('Starting httpd...')
httpd.serve_forever()

if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion hostkey-order/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion http-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions keyboard-interactive-custom/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Copyright (c) 2022 Termius Corporation.
FROM ubuntu:20.04 as builder
FROM ubuntu:22.04 as builder

RUN mkdir /app && apt-get update -y && apt-get upgrade -y && apt-get install -y gcc libpam0g-dev
ADD keyboard-interactive-custom/termius-pam.c /app/termius-pam.c
WORKDIR /app/
RUN gcc -fPIC -c termius-pam.c && gcc -shared -o termius-pam.so termius-pam.o -lpam

FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion keyboard-interactive-edgecases/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion keyboard-interactive-pass/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion mosh/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion multiple-auths/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion otp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion pass/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
3 changes: 1 addition & 2 deletions raspbian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM balenalib/rpi-raspbian
FROM balenalib/rpi-raspbian:bullseye-20220125

# RUN apt-get update -y && apt-get install -y locales && \
# locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
# ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive

RUN apt-get update -y && apt-get upgrade -y && \
apt-get install -y openssh-server gettext-base syslog-ng \
tmux byobu emacs vim mc htop curl nano \
Expand Down
2 changes: 1 addition & 1 deletion sftp-disabled/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion socks5/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion telnet/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion tinyssh/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && apt-get install locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down
2 changes: 1 addition & 1 deletion yubikey-pam/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && apt-get install -y locales && \
locale-gen en_US.UTF-8 && update-locale LC_ALL="en_US.UTF-8"
Expand Down