parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

forwarding.py and ssh.py: use exec.run_(root_)cmd()

Browse source
This commit is contained in:
InsanePrawn 2022-08-15 06:12:27 +02:00
parent 7fcd68ced9
commit 0465d1035a
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
forwarding.py
View file

@ -1,6 +1,7 @@
import click
import subprocess
from logger import logging
import logging
from exec import run_root_cmd
from ssh import run_ssh_command
from wrapper import check_programs_wrap
@ -10,25 +11,26 @@ def cmd_forwarding():
"""Enable network forwarding for a usb-attached device"""
check_programs_wrap(['syctl', 'iptables'])
result = subprocess.run([
logging.info("Enabling ipv4 forwarding with sysctl")
result = run_root_cmd([
'sysctl',
'net.ipv4.ip_forward=1',
])
if result.returncode != 0:
logging.fatal(f'Failed to enable ipv4 forward via sysctl')
exit(1)
click.Abort('Failed to enable ipv4 forward via sysctl')
result = subprocess.run([
logging.info("Enabling ipv4 forwarding with iptables")
result = run_root_cmd([
'iptables',
'-P',
'FORWARD',
'ACCEPT',
])
if result.returncode != 0:
logging.fatal(f'Failed set iptables rule')
exit(1)
click.Abort('Failed set iptables rule')
result = subprocess.run([
logging.info("Enabling ipv4 NATting with iptables")
result = run_root_cmd([
'iptables',
'-A',
'POSTROUTING',
@ -40,10 +42,9 @@ def cmd_forwarding():
'172.16.42.0/24',
])
if result.returncode != 0:
logging.fatal(f'Failed set iptables rule')
exit(1)
click.Abort('Failed set iptables rule')
logging.info("Setting default route on device via ssh")
result = run_ssh_command(cmd=['sudo -S route add default gw 172.16.42.2'])
if result.returncode != 0:
logging.fatal(f'Failed to add gateway over ssh')
exit(1)
click.Abort('Failed to add gateway over ssh')

10
ssh.py
View file

@ -2,11 +2,11 @@ from typing import Optional
import logging
import os
import pathlib
import subprocess
import click
from config import config
from constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT
from exec import run_cmd
@click.command(name='ssh')
@ -44,7 +44,7 @@ def run_ssh_command(cmd: list[str] = [],
'--',
] + cmd
logging.debug(f"running cmd: {full_cmd}")
return subprocess.run(full_cmd)
return run_cmd(full_cmd)
def scp_put_files(src: list[str], dst: str, user: str = None, host: str = SSH_DEFAULT_HOST, port: int = SSH_DEFAULT_PORT):
@ -64,7 +64,7 @@ def scp_put_files(src: list[str], dst: str, user: str = None, host: str = SSH_DE
]
logging.info(f"Copying files to {user}@{host}:{dst}:\n{src}")
logging.debug(f"running cmd: {cmd}")
return subprocess.run(cmd)
return run_cmd(cmd)
def find_ssh_keys():
@ -95,7 +95,7 @@ def copy_ssh_keys(root_dir: str, user: str):
create = click.confirm("Do you want me to generate an ssh key for you?", True)
if not create:
return
result = subprocess.run([
result = run_cmd([
'ssh-keygen',
'-f',
os.path.join(pathlib.Path.home(), '.ssh', 'id_ed25519_kupfer'),
@ -106,7 +106,7 @@ def copy_ssh_keys(root_dir: str, user: str):
'-N',
'',
])
if result.returncode != 0:
if result.returncode != 0: # type: ignore
logging.fatal("Failed to generate ssh key")
keys = find_ssh_keys()