mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 15:25:27 +00:00
Code Issues Releases Wiki Activity

[2/2] Add JSON interface to UI_Changes

Browse Source 
Provides the filename in the json format, which can be
directly read by Yast. Increased the protocol version; perhaps
it should go in the next release.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>


[cboltz] fix "unused variable" warning and add a comment about ignoring
         the JSON response



Acked-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
Goldwyn Rodrigues
2017-10-26 00:36:48 +02:00
committed by Christian Boltz
parent 6ce2768115
commit 9a69ec2c48
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
utils/apparmor/ui.py
View File

@@ -45,7 +45,7 @@ def write_json(jsonout):
def set_json_mode(): def set_json_mode():
global UI_mode global UI_mode
UI_mode = 'json' UI_mode = 'json'
jsonout = {'dialog': 'apparmor-json-version', 'data': '2.12'} jsonout = {'dialog': 'apparmor-json-version', 'data': '2.13'}
write_json(jsonout) write_json(jsonout)
# reads the response on command line for json and verifies the response # reads the response on command line for json and verifies the response
@@ -250,9 +250,16 @@ def generate_diff_with_comments(oldprofile, newprofile):
def UI_Changes(oldprofile, newprofile, comments=False): def UI_Changes(oldprofile, newprofile, comments=False):
if comments == False: if comments == False:
difftemp = generate_diff(oldprofile, newprofile) difftemp = generate_diff(oldprofile, newprofile)
header = 'View Changes'
else: else:
difftemp = generate_diff_with_comments(oldprofile, newprofile) difftemp = generate_diff_with_comments(oldprofile, newprofile)
subprocess.call('less %s' % difftemp.name, shell=True) header = 'View Changes with comments'
if UI_mode == 'json':
jsonout = {'dialog': 'changes', 'header':header, 'filename': difftemp.name}
write_json(jsonout)
json_response('changes')["response"] # response gets ignored, therefore not assigning to a variable
else:
subprocess.call('less %s' % difftemp.name, shell=True)
difftemp.close() difftemp.close()
CMDS = {'CMD_ALLOW': _('(A)llow'), CMDS = {'CMD_ALLOW': _('(A)llow'),