Skip to content

CLI enhancements #25

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

Closed
pferrot wants to merge 2 commits into from
Closed

CLI enhancements #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71516ec
Allow to specify custom proxy port.
Mar 3, 2016
3ec1f47
Use 'requests' instead of 'curl'
Mar 21, 2016
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
47 changes: 33 additions & 14 deletions ochothon/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
#
"""
Minimalistic self-contained wrapper performing the curl calls to the ochopod proxy. The input is
turned into a POST -H X-Shell:<> to the proxy at port TCP 9000. Any token from that input that
turned into a POST -H X-Shell:<> to the proxy at port TCP 9000 (default). Any token from that input that
matches a local file (wherever the script is running from) will force an upload for the said file.
This mechanism is used for instance to upload the container definition YAML files when deploying a
new cluster.

The proxy ip or hostname is either passed as the first command-line argument or vi a $OCHOPOD_PROXY.
The proxy ip or hostname is either passed as the first command-line argument or via $OCHOPOD_PROXY.
The default TCP port (9000) can be overridden with the syntax <prox_ip>:<proxy_port>.
Type "help" to get the list of supported commands.

For instance:
Expand Down Expand Up @@ -53,8 +54,10 @@

from common import shell
from os.path import abspath, basename, expanduser, isdir, isfile, join
from requests import post
from sys import exit

PORT_DEFAULT = 9000

def cli(args):

Expand All @@ -63,9 +66,12 @@ def cli(args):

class Shell(cmd.Cmd):

def __init__(self, ip, token=None):
def __init__(self, ipAndPort, token=None):
cmd.Cmd.__init__(self)
self.prompt = '%s > ' % ip
#
# - do not show port number when the default one is used
#
self.prompt = '%s > ' % (ipAndPort if not ipAndPort.endswith(':%s' % PORT_DEFAULT) else ipAndPort[:-len(':%s' % PORT_DEFAULT)])
self.ruler = '-'
self.token = token

Expand Down Expand Up @@ -123,28 +129,41 @@ def do_shell(self, line):
# - parse & print
#
line = ' '.join(substituted)
unrolled = ['-F %s=@%s' % (k, v) for k, v in files.items()]
digest = 'sha1=' + hmac.new(self.token, line, hashlib.sha1).hexdigest() if self.token else ''
snippet = 'curl -X POST -H "X-Shell:%s" -H "X-Signature:%s" %s %s:9000/shell' % (line, digest, ' '.join(unrolled), ip)
code, out = shell(snippet, cwd=tmp)
url = 'http://%s/shell' % ipAndPort
headers = \
{
'X-Signature': digest,
'X-Shell': line
}
files_post = {file_id: open(files[file_id], 'rb') for file_id in files.keys()}
reply = post(url, headers=headers, files=files_post)
code = reply.status_code
out = reply.content
js = json.loads(out.decode('utf-8'))
print(js['out'] if code is 0 else 'i/o failure (is the proxy down ?)')
print(js['out'] if code is 200 else 'i/o failure (is the proxy down ?)')

#
# - partition ip and args by looking for OCHOPOD_PROXY first
# - if OCHOPOD_PROXY is not used, treat the first argument as the ip
#
ip = None
ipAndPort = None
if 'OCHOPOD_PROXY' in os.environ:
ip = os.environ['OCHOPOD_PROXY']
ipAndPort = os.environ['OCHOPOD_PROXY']
elif len(args):
ip = args[0]
ipAndPort = args[0]
args = args[1:] if len(args) > 1 else []

#
# - fail if left undefined
#
assert ip is not None, 'either set $OCHOPOD_PROXY or pass the proxy IP as an argument'
assert ipAndPort is not None, 'either set $OCHOPOD_PROXY or pass the proxy IP as an argument'

#
# - 9000 is the default port
#
if ":" not in ipAndPort:
ipAndPort = ipAndPort + (':%s' % PORT_DEFAULT)

#
# - set the secret token if specified via the $OCHOPOD_TOKEN variable
Expand All @@ -157,12 +176,12 @@ def do_shell(self, line):
#
if len(args):
command = " ".join(args)
Shell(ip, token).do_shell(command)
Shell(ipAndPort, token).do_shell(command)
else:
print('welcome to the ocho CLI ! (CTRL-C or exit to get out)')
if token is None:
print 'warning, $OCHOPOD_TOKEN is undefined'
Shell(ip, token).cmdloop()
Shell(ipAndPort, token).cmdloop()

except KeyboardInterrupt:
exit(0)
Expand Down