Skip to content

[acl-loader] Not to crash upon invalid rule #232

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

Merged
lguohan merged 1 commit into from
Apr 6, 2018
Merged

[acl-loader] Not to crash upon invalid rule #232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions acl_loader/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import click
import json
import syslog
import tabulate
from natsort import natsorted

Expand All @@ -13,14 +14,17 @@

def info(msg):
click.echo(click.style("Info: ", fg='cyan') + click.style(str(msg), fg='green'))
syslog.syslog(syslog.LOG_INFO, msg)


def warning(msg):
click.echo(click.style("Warning: ", fg='cyan') + click.style(str(msg), fg='yellow'))
syslog.syslog(syslog.LOG_WARNING, msg)


def error(msg):
click.echo(click.style("Error: ", fg='cyan') + click.style(str(msg), fg='red'))
syslog.syslog(syslog.LOG_ERR, msg)


def deep_update(dst, src):
Expand Down Expand Up @@ -354,8 +358,11 @@ def convert_rules(self):

for acl_entry_name in acl_set.acl_entries.acl_entry:
acl_entry = acl_set.acl_entries.acl_entry[acl_entry_name]
rule = self.convert_rule_to_db_schema(table_name, acl_entry)
deep_update(self.rules_info, rule)
try:
rule = self.convert_rule_to_db_schema(table_name, acl_entry)
deep_update(self.rules_info, rule)
except AclLoaderException as ex:
error("Error processing rule %s: %s. Skipped." % (acl_entry_name, ex))

if not self.is_table_mirror(table_name):
deep_update(self.rules_info, self.deny_rule(table_name))
Expand Down