Rooba
/
cowrie
mirror of https://github.com/cowrie/cowrie.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes #1236 user/group name columns are now justified (#1237)

This commit is contained in:
Isaac Jackson 2019-10-24 20:20:41 +11:00 committed by Michel Oosterhof
parent 2d8dbb9aa1
commit d0b211f41d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cowrie/commands/ls.py
View File

@ -112,9 +112,17 @@ class command_ls(HoneyPotCommand):
def do_ls_l(self, path): def do_ls_l(self, path):
files = self.get_dir_files(path) files = self.get_dir_files(path)
largest = 0 filesize_str_extent = 0
if len(files): if len(files):
largest = max([x[fs.A_SIZE] for x in files]) filesize_str_extent = max([len(str(x[fs.A_SIZE])) for x in files])
user_name_str_extent = 0
if len(files):
user_name_str_extent = max([len(self.uid2name(x[fs.A_UID])) for x in files])
group_name_str_extent = 0
if len(files):
group_name_str_extent = max([len(self.gid2name(x[fs.A_GID])) for x in files])
for file in files: for file in files:
if file[fs.A_NAME].startswith('.') and not self.showHidden: if file[fs.A_NAME].startswith('.') and not self.showHidden:
@ -167,9 +175,9 @@ class command_ls(HoneyPotCommand):
line = '%s 1 %s %s %s %s %s%s' % \ line = '%s 1 %s %s %s %s %s%s' % \
(perms, (perms,
self.uid2name(file[fs.A_UID]), self.uid2name(file[fs.A_UID]).ljust(user_name_str_extent),
self.gid2name(file[fs.A_GID]), self.gid2name(file[fs.A_GID]).ljust(group_name_str_extent),
str(file[fs.A_SIZE]).rjust(len(str(largest))), str(file[fs.A_SIZE]).rjust(filesize_str_extent),
time.strftime('%Y-%m-%d %H:%M', ctime), time.strftime('%Y-%m-%d %H:%M', ctime),
file[fs.A_NAME], file[fs.A_NAME],
linktarget) linktarget)