Compare commits

..

No commits in common. "6430/customers_list" and "master" have entirely different histories.

8 changed files with 22 additions and 216 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
.idea/
__pycache__/

View File

@ -5,11 +5,12 @@ name = "pypi"
[packages]
requests = "*"
pyotp = "*"
apixu = {git = "https://github.com/apixu/apixu-python.git",ref = "master"}
tabulate = "*"
[dev-packages]
[requires]
python_version = "3.7"
[packages.apixu]
git = "https://github.com/apixu/apixu-python.git"
ref = "master"

25
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "b6d5bcc7b985514e125b8217b8d9f9467b2fc357f4760cd5e83bf0c115b37ea2"
"sha256": "ca9c2522bf07f03d1588afe76e9f6fc73bc1efec20d4f155d82b709efaf14a56"
},
"pipfile-spec": 6,
"requires": {
@ -18,14 +18,14 @@
"default": {
"apixu": {
"git": "https://github.com/apixu/apixu-python.git",
"ref": "370216999346d5caf7f8dc6724b5766dcc6da25d"
"ref": "master"
},
"certifi": {
"hashes": [
"sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
"sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
"sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5",
"sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae"
],
"version": "==2019.6.16"
"version": "==2019.3.9"
},
"chardet": {
"hashes": [
@ -41,14 +41,6 @@
],
"version": "==2.8"
},
"pyotp": {
"hashes": [
"sha256:c88f37fd47541a580b744b42136f387cdad481b560ef410c0d85c957eb2a2bc0",
"sha256:fc537e8acd985c5cbf51e11b7d53c42276fee017a73aec7c07380695671ca1a1"
],
"index": "pypi",
"version": "==2.3.0"
},
"requests": {
"hashes": [
"sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
@ -57,13 +49,6 @@
"index": "pypi",
"version": "==2.22.0"
},
"tabulate": {
"hashes": [
"sha256:8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943"
],
"index": "pypi",
"version": "==0.8.3"
},
"urllib3": {
"hashes": [
"sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1",

View File

@ -25,23 +25,10 @@ ungleich --help
ungleich weather
```
## Usage: Config
```
ungleich config-add \
--name <otp username>
--realm <otp realm>
--seed <otp seed>
```
## Usage: DNS
```
ungleich dns \
--set-reverse <ip>
--user <user_id>
--email <email>
--name mirror.example.com
ungleich dns --set-reverse <ip> --user <username> --token <token> --realm <realm> --email <email> --name mirror.example.com
```
### Usage: RIPE
@ -60,11 +47,8 @@ ungleich ripe-add-route6 \
Creating a new account object:
```
ungleich account \
--create-user <username>
--name <firstname>
--lastname <lastname>
--email <email>
ungleich account --create-user <username> --name <firstname> --lastname <lastname> --email <email>
```
### Usage: SSH Key

View File

@ -7,8 +7,6 @@ from ungleich_ripe import ungleichRIPE
from ungleich_account import Account_Create
from ungleich_weather import ungleichWeather
from ungleich_ssh_key import SSHKey
from ungleich_config import Ungleich_Config
from ungleich_pay import ungleichPay
VERSION = "0.0.4"
@ -19,11 +17,9 @@ class ungleichCLI(object):
# FIXME: make it generic
dns = ungleichDNS(self.parser, self.parser_parents)
ripe = ungleichRIPE(self.parser, self.parser_parents)
account = Account_Create(self.parser, self.parser_parents)
config = Ungleich_Config(self.parser, self.parser_parents)
ripe = Account_Create(self.parser, self.parser_parents)
SSHKey(self.parser, self.parser_parents)
ungleichWeather(self.parser, self.parser_parents)
ungleichPay(self.parser, self.parser_parents)
def _init_parser(self):
self.parser = {}

View File

@ -1,82 +0,0 @@
import argparse
import json
import urllib.request
class Ungleich_Config(object):
def __init__(self, parser, parents):
self.parser = parser
self.parser['add'] = self.parser['sub'].add_parser(
'config-add',
help="Add user to configuration file",
parents=[parents])
self.parser['list'] = self.parser['sub'].add_parser(
'config-list',
help="list users in configuration file",
parents=[parents])
self.parser['delete'] = self.parser['sub'].add_parser(
'config-delete',
help="remove a user in configuration file",
parents=[parents])
self.parser['add'].add_argument('--name', help='otp name', required=True)
self.parser['add'].add_argument('--realm', help='otp realm', required=True)
self.parser['add'].add_argument('--seed', help='otp seed', required=True)
self.parser['delete'].add_argument('--id', help='user ID to remove', required=True)
self.parser['list'].set_defaults(func=self._list_users)
self.parser['add'].set_defaults(func=self._add_user)
self.parser['delete'].set_defaults(func=self._delete_user)
def _add_user(self, args):
try:
f = open('users.json', 'r')
json_info = json.loads(f.read())
if len(json_info) > 0:
with open('users.json', 'w') as fp:
last_id = int(list(json_info.keys())[-1]) + 1
json_info[last_id] = {"name": args.name, "realm": args.realm, "seed": args.seed}
json.dump(json_info, fp)
print('User added.')
else:
with open('users.json', 'w') as fp:
d = {"name": args.name, "realm": args.realm, "seed": args.seed}
json.dump({"1": d}, fp)
print('User added.')
except FileNotFoundError:
with open('users.json', 'w') as fp:
d = {"name": args.name, "realm": args.realm, "seed": args.seed}
json.dump({"1": d}, fp)
print('User added.')
def _list_users(self, args):
try:
f = open('users.json', 'r')
json_info = json.loads(f.read())
for key, value in json_info.items():
print('{}: {}'.format(key, value['name']))
except FileNotFoundError:
print('No users loaded.')
def _delete_user(self, args):
try:
f = open('users.json', 'r')
json_info = json.loads(f.read())
try:
del json_info[args.id]
f = open('users.json', 'w')
x = 1
for i in list(json_info.keys()):
json_info[str(x)] = json_info.pop(i)
x+=1
f.write(json.dumps(json_info))
f.close()
except KeyError:
print("No user with such id.")
except FileNotFoundError:
print('No users loaded.')

View File

@ -1,7 +1,7 @@
import urllib.request
import argparse
import json
from pyotp import TOTP
class ungleichDNS(object):
def __init__(self, parser, parents):
@ -13,16 +13,15 @@ class ungleichDNS(object):
parents=[parents])
self.parser['dns'].add_argument('--set-reverse', help='REQUIRED: IPv6 Address of your VM', required=True)
self.parser['dns'].add_argument('--user', help='Your stored user ID', required=True)
self.parser['dns'].add_argument('--user', help='Your ungleich username', required=True)
self.parser['dns'].add_argument('--token', help='Your ungleich 6 digit OTP generated token', type=int, required=True)
self.parser['dns'].add_argument('--name', help='Hostname', required=True)
self.parser['dns'].add_argument('--email', help='registered email', required=True)
self.parser['dns'].add_argument('--realm', help='Otp realm', required=True)
self.parser['dns'].set_defaults(func=self._handle_dns)
def _handle_dns(self, args):
"""Reverse dns endpoint."""
f = open('users.json', 'r')
data = json.loads(f.read())[args.user]
url = 'https://dns.service.ungleich.ch'
req = urllib.request.Request(
url=url,
@ -31,17 +30,13 @@ class ungleichDNS(object):
"Content-Type": "application/json"
},
data=json.dumps({
'username': data['name'],
'token': TOTP(data['seed']).now(),
'username': args.user,
'token': args.token,
'ipaddress': args.set_reverse,
'name': args.name,
'email': args.email,
'realm': data['realm']
'realm': args.realm
}).encode('utf-8')
)
try:
response = urllib.request.urlopen(req).read()
print(response)
except urllib.error.HTTPError as e:
error_message = e.read()
print(json.loads(error_message))
response = urllib.request.urlopen(req).read()
print(json.loads(response))

View File

@ -1,72 +0,0 @@
import urllib.request
import json
import sys
from pyotp import TOTP
from tabulate import tabulate
UNGLEICH_PAY_SERVER_URL = "https://pay.ungleich.ch"
class ungleichPay(object):
def __init__(self, parser, parents):
self.parser = parser
self.parser['customers-list'] = self.parser['sub'].add_parser(
'customers-list',
help="List customers who have an active VM at ungleich",
parents=[parents])
self.parser['customers-list'].add_argument('--username', required=True)
self.parser['customers-list'].add_argument('--realm', required=True)
self.parser['customers-list'].add_argument(
'--seed', required=True,
help="A valid seed obtained from ungleich"
)
self.parser['customers-list'].add_argument(
'--email', required=True,
help="Email associated with the username"
)
self.parser['customers-list'].add_argument(
'--ungleich-pay-server', required=False,
help="A valid ungleich pay server url"
)
self.parser['customers-list'].set_defaults(func=self.customers_list)
def customers_list(self, args):
customers_list_endpoint = "/customers-list/"
if args.ungleich_pay_server:
request_url = args.ungleich_pay_server + customers_list_endpoint
else:
request_url = UNGLEICH_PAY_SERVER_URL + customers_list_endpoint
print(f"request_url={request_url}")
req = urllib.request.Request(url=request_url,
method='GET',
headers={
"email": args.email,
"username": args.username,
"realm": args.realm,
"token": TOTP(args.seed).now(),
"Accept": "application/json"
})
try:
response = urllib.request.urlopen(req)
except urllib.error.HTTPError as err:
print(str(err))
sys.exit(1)
except urllib.error.URLError as uerr:
print(str(uerr))
sys.exit(2)
response_json = json.loads(response.read().decode('utf-8'))
if (response_json['response'] == 'success'):
data = response_json["data"]
rows = [(x['email'], x['vm_count']) for x in data]
headers = ["customer", "vm_count"]
print("---")
print(tabulate(rows, headers))
print("---")
vm_count = 0
for x in data:
vm_count += x['vm_count']
print("Total vm_count = {}".format(vm_count))
else:
print("An error occurred.")
print(response_json["message"])