Merge pull request 'Usertwist update' (#6) from main into dev

Reviewed-on: #6

.gitattributes

@@ -0,0 +1,2 @@
+usertwist filter=lfs diff=lfs merge=lfs -text
+files/usertwist filter=lfs diff=lfs merge=lfs -text

bootstrap.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+read -p "Enter root password : " password
+
+# Update APT repos
+sudo apt update
+
+# Make sure python is installed
+sudo apt install python3 python3-pip -y
+
+# Install pipx
+sudo apt install pipx -y
+pipx ensurepath
+
+# Install Ansible
+pipx install --include-deps ansible
+
+# Install sshpass (for ssh password connection) & passlib (for password encryption)
+sudo apt install python3-passlib sshpass
+pipx inject ansible passlib
+
+# Make sure git & git-lfs are installed and configured
+sudo apt install git git-lfs -y
+git lfs install
+
+# Clone ansible_playbooks repo
+git clone -b dev https://git.athelas-conseils.fr/Stage/ansible_playbooks.git
+
+
+~/.local/bin/ansible-playbook ansible_playbooks/tasks/full_setup.yml -i ansible_playbooks/inventory.ini --extra-vars "ansible_ssh_pass=$password ansible_ssh_common_args='-o StrictHostKeyChecking=no'"

files/usertwist.service

@@ -2,9 +2,19 @@
 Description=Simple Web Service
 
 [Service]
-User=caddy
-Group=caddy
+User=usertwist
+Group=usertwist
 ExecStart=/usr/local/bin/usertwist
+PrivateTmp=yes
+NoNewPrivileges=true
+RestrictNamespaces=uts ipc pid user cgroup
+ProtectSystem=strict
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ProtectKernelTunables=yes
+ProtectKernelModules=yes
+ProtectControlGroups=yes
+PrivateDevices=yes
+RestrictSUIDSGID=true
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

tasks/install_caddy.yml

@@ -26,12 +26,22 @@
 
   - name: Editing Caddyfile to setup the reverse_proxy
     ansible.builtin.template:
-      src: ~/ansible/templates/Caddyfile.j2
+      src: ../templates/Caddyfile.j2
       dest: /etc/caddy/Caddyfile
 
+  - name: Create the usertwist group
+    ansible.builtin.group:
+      name: usertwist
+
+  - name: Create the usertwist user
+    ansible.builtin.user:
+      name: usertwist
+      group: usertwist
+      system: true
+
   - name: Put the service binary on the remote server
     ansible.builtin.copy:
-      src: ~/ansible/files/usertwist
+      src: ../files/usertwist
       dest: /usr/local/bin
       owner: root
       group: root
@@ -39,7 +49,7 @@
 
   - name: Put the service systemd file on the remote server
     ansible.builtin.copy:
-      src: ~/ansible/files/usertwist.service
+      src: ../files/usertwist.service
       dest: /etc/systemd/system
       owner: root
       group: root

tasks/roles/setup_iptables/README.md

@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).

tasks/roles/setup_iptables/meta/main.yml

@@ -0,0 +1,34 @@
+galaxy_info:
+  author: Motysten
+  description: Dev
+  company: Athelas
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.

tasks/roles/setup_iptables/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+# tasks file for setup_iptables
+- name: Open needed ports
+  ansible.builtin.iptables:
+    chain: INPUT
+    protocol: tcp
+    in_interface: eth0
+    jump: ACCEPT
+    destination_ports:
+      - "22"
+      - "443"
+      - "80"
+
+- name: Set INPUT policy to DROP
+  ansible.builtin.iptables:
+    chain: INPUT
+    policy: DROP

tasks/setup_iptables.yml

@@ -1,20 +1,6 @@
 - name: Edit iptables settings
   hosts: athelas
   become: true
-  tasks:
-
-  - name: Open needed ports
-    ansible.builtin.iptables:
-      chain: INPUT
-      protocol: tcp
-      in_interface: eth0
-      jump: ACCEPT
-      destination_ports:
-        - "22"
-        - "8081"
-        - "80"
-
-  - name: Set INPUT policy to DROP
-    ansible.builtin.iptables:
-      chain: INPUT
-      policy: DROP
+  
+  roles:
+    - setup_iptables

tasks/setup_ssh.yml

@@ -9,19 +9,19 @@
 
   - name: Get SSH Private Key
     ansible.builtin.fetch:
-      dest: "~/ansible/keys/"
+      dest: "../keys/"
       src: "~/ssh_key"
       flat: true
 
   - name: Get SSH Public Key
     ansible.builtin.fetch:
-      dest: "~/ansible/keys/"
+      dest: "../keys/"
       src: "~/ssh_key.pub"
       flat: true
 
   - name: Copy new SSH configuration
     ansible.builtin.template:
-      src: "~/ansible/templates/sshd_config.j2"
+      src: "../templates/sshd_config.j2"
       dest: "/etc/ssh/sshd_config"
 
   - name: Create new user
@@ -40,7 +40,7 @@
   - name: Add SSH public key to remote host
     ansible.builtin.authorized_key:
       user: "motysten"
-      key: "{{ lookup('file', '~/ansible/keys/ssh_key.pub') }}"
+      key: "{{ lookup('file', '../keys/ssh_key.pub') }}"
     become: true
 
   - name: Restart SSH Services

templates/Caddyfile.j2

@@ -8,7 +8,7 @@
 # this machine's public IP, then replace ":80" below with your
 # domain name.
 
-poc.athelas.fr:8081 {
+poc.athelas.fr {
 
 	# Another common task is to set up a reverse proxy:
 	reverse_proxy localhost:8080
@@ -18,6 +18,14 @@ poc.athelas.fr:8081 {
 		ca https://acme-staging-v02.api.letsencrypt.org/directory
 	}
 
+	handle_errors {
+		rewrite * /{err.status_code}
+		reverse_proxy https://http.cat {
+			header_up Host {upstream_hostport}
+			replace_status {err.status_code}
+		}
+	}
+
 }
 
 # Refer to the Caddy docs for more information: