-----
- Update the name of the library (from moon_db)
+1.2.5
+-----
+- Code cleaning
+
+++ /dev/null
-#!/usr/bin/env bash
-
-VERSION=moon_db-$(grep __version__ moon_db/__init__.py | cut -d "\"" -f 2)
-
-python3 setup.py sdist bdist_wheel
-
-rm dist/*.asc 2>/dev/null
-
-gpg --detach-sign -u "A0A96E75" -a dist/${VERSION}-py3-none-any.whl
-gpg --detach-sign -u "A0A96E75" -a dist/${VERSION}.tar.gz
-
-if [ "$1" = "upload" ]; then
- twine upload dist/${VERSION}-py3-none-any.whl dist/${VERSION}-py3-none-any.whl.asc
- twine upload dist/${VERSION}.tar.gz dist/${VERSION}.tar.gz.asc
- rm -f ../moon_orchestrator/dist/moon_db*
- rm -f ../moon_interface/dist/moon_db*
- rm -f ../moon_manager/dist/moon_db*
- rm -f ../moon_authz/dist/moon_db*
- rm -f ../moon_wrapper/dist/moon_db*
-fi
-
-if [ "$1" = "copy" ]; then
- mkdir -p ../moon_orchestrator/dist/ 2>/dev/null
- rm -f ../moon_orchestrator/dist/moon_db*
- cp -v dist/${VERSION}-py3-none-any.whl ../moon_orchestrator/dist/
- mkdir -p ../moon_interface/dist/ 2>/dev/null
- rm -f ../moon_interface/dist/moon_db*
- cp -v dist/${VERSION}-py3-none-any.whl ../moon_interface/dist/
- mkdir -p ../moon_manager/dist/ 2>/dev/null
- rm -f ../moon_manager/dist/moon_db*
- cp -v dist/${VERSION}-py3-none-any.whl ../moon_manager/dist/
- mkdir -p ../moon_authz/dist/ 2>/dev/null
- rm -f ../moon_authz/dist/moon_db*
- cp -v dist/${VERSION}-py3-none-any.whl ../moon_authz/dist/
- mkdir -p ../moon_wrapper/dist/ 2>/dev/null
- rm -f ../moon_wrapper/dist/moon_db*
- cp -v dist/${VERSION}-py3-none-any.whl ../moon_wrapper/dist/
-fi
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-__version__ = "1.2.4"
+__version__ = "1.2.5"
import requests
import json
from uuid import uuid4
-from oslo_log import log as logging
+import logging
from python_moonutilities import exceptions, configuration
from python_moonutilities.security_functions import filter_input, login, logout
from python_moondb.api.managers import Managers
-LOG = logging.getLogger("moon.db.api.keystone")
+logger = logging.getLogger("moon.db.api.keystone")
class KeystoneManager(Managers):
_headers = login()
req = requests.get("{}{}".format(self.__url, endpoint), headers=_headers, verify=False)
if req.status_code not in (200, 201):
- LOG.error(req.text)
+ logger.error(req.text)
raise _exception
data = req.json()
logout(_headers)
data=json.dumps(data),
headers=_headers, verify=False)
if req.status_code == 409:
- LOG.warning(req.text)
+ logger.warning(req.text)
raise exceptions.KeystoneUserConflict
if req.status_code not in (200, 201):
- LOG.error(req.text)
+ logger.error(req.text)
raise _exception
data = req.json()
logout(_headers)
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-from oslo_log import log as logging
-LOG = logging.getLogger("moon.db.api.managers")
+import logging
+logger = logging.getLogger("moon.db.api.managers")
class Managers(object):
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
from uuid import uuid4
-from oslo_log import log as logging
+import logging
from python_moonutilities import exceptions
from python_moonutilities.security_functions import filter_input, enforce
from python_moondb.api.managers import Managers
-LOG = logging.getLogger("moon.db.api.model")
+logger = logging.getLogger("moon.db.api.model")
class ModelManager(Managers):
raise exceptions.MetaRuleExisting
if not meta_rule_id:
meta_rule_id = uuid4().hex
- LOG.info("add_meta_rule {}".format(value))
+ logger.info("add_meta_rule {}".format(value))
return self.driver.set_meta_rule(meta_rule_id=meta_rule_id, value=value)
@enforce(("read", "write"), "meta_rules")
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
from uuid import uuid4
-from oslo_log import log as logging
-from python_moonutilities.security_functions import filter_input, enforce
+import logging
+from python_moonutilities.security_functions import enforce
from python_moondb.api.managers import Managers
-LOG = logging.getLogger("moon.db.api.pdp")
+logger = logging.getLogger("moon.db.api.pdp")
class PDPManager(Managers):
from python_moonutilities.security_functions import enforce
from python_moondb.api.managers import Managers
-LOG = logging.getLogger("moon.db.api.policy")
+logger = logging.getLogger("moon.db.api.policy")
class PolicyManager(Managers):
k_user = Managers.KeystoneManager.create_user(value)
if not perimeter_id:
try:
- LOG.info("k_user={}".format(k_user))
+ logger.info("k_user={}".format(k_user))
perimeter_id = k_user['users'][0].get('id', uuid4().hex)
except IndexError:
k_user = Managers.KeystoneManager.get_user_by_name(
+++ /dev/null
-# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
-# This software is distributed under the terms and conditions of the 'Apache-2.0'
-# license which can be found in the file 'LICENSE' in this package distribution
-# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-
-import logging
-import time
-from python_moondb.core import LogDriver
-
-
-class LogConnector(LogDriver):
-
- AUTHZ_FILE = '/var/log/moon/authz.log'
- SYS_FILE = '/var/log/moon/system.log'
- TIME_FORMAT = '%Y-%m-%d-%H:%M:%S'
-
- def __init__(self):
- # Fixme (dthom): when logging from an other class, the %appname% in the event
- # is always keystone.contrib.moon.backends.flat
- super(LogConnector, self).__init__()
-
- self.SYS_LOG = logging.getLogger(__name__)
- if not len(self.SYS_LOG.handlers):
- fh = logging.FileHandler(self.SYS_FILE)
- fh.setLevel(logging.DEBUG)
- formatter = logging.Formatter('%(asctime)s ------ %(message)s', self.TIME_FORMAT)
- fh.setFormatter(formatter)
- self.SYS_LOG.addHandler(fh)
-
- self.AUTHZ_LOG = logging.getLogger("authz")
- if not len(self.AUTHZ_LOG.handlers):
- fh = logging.FileHandler(self.AUTHZ_FILE)
- fh.setLevel(logging.WARNING)
- formatter = logging.Formatter('%(asctime)s ------ %(message)s', self.TIME_FORMAT)
- fh.setFormatter(formatter)
- self.AUTHZ_LOG.addHandler(fh)
-
- def authz(self, message):
- self.AUTHZ_LOG.warn(message)
-
- def debug(self, message):
- self.SYS_LOG.debug(message)
-
- def info(self, message):
- self.SYS_LOG.info(message)
-
- def warning(self, message):
- self.SYS_LOG.warning(message)
-
- def error(self, message):
- self.SYS_LOG.error(message)
-
- def critical(self, message):
- self.SYS_LOG.critical(message)
-
- def get_logs(self, logger="authz", event_number=None, time_from=None, time_to=None, filter_str=None):
- if logger == "authz":
- _logs = open(self.AUTHZ_FILE).readlines()
- else:
- _logs = open(self.SYS_FILE).readlines()
- if filter_str:
- _logs = filter(lambda x: filter_str in x, _logs)
- if time_from:
- if isinstance(time_from, str):
- time_from = time.strptime(time_from.split(" ")[0], self.TIME_FORMAT)
- try:
- __logs = []
- for log in _logs:
- _log = time.strptime(log.split(" ")[0], self.TIME_FORMAT)
- if time_from <= _log:
- __logs.append(log)
- _logs = __logs
- except ValueError:
- self.error("Time format error")
- if time_to:
- try:
- if isinstance(time_to, str):
- time_to = time.strptime(time_to.split(" ")[0], self.TIME_FORMAT)
- __logs = []
- for log in _logs:
- _log = time.strptime(log.split(" ")[0], self.TIME_FORMAT)
- if time_to >= _log:
- __logs.append(log)
- _logs = __logs
- except ValueError:
- self.error("Time format error")
- if event_number:
- _logs = _logs[-event_number:]
- return list(_logs)
from python_moonutilities.exceptions import *
from python_moondb.core import PDPDriver, PolicyDriver, ModelDriver
-LOG = logging.getLogger("moon.db.driver.sql")
+logger = logging.getLogger("moon.db.driver.sql")
Base = declarative_base()
DEBUG = True if configuration.get_configuration("logging")['logging']['loggers']['moon']['level'] == "DEBUG" else False
session.delete(_action)
def get_subject_data(self, policy_id, data_id=None, category_id=None):
- LOG.info("driver {} {} {}".format(policy_id, data_id, category_id))
+ logger.info("driver {} {} {}".format(policy_id, data_id, category_id))
with self.get_session_for_read() as session:
query = session.query(SubjectData)
if data_id:
else:
query = query.filter_by(policy_id=policy_id, category_id=category_id)
ref_list = query.all()
- LOG.info("ref_list={}".format(ref_list))
+ logger.info("ref_list={}".format(ref_list))
return {
"policy_id": policy_id,
"category_id": category_id,
ref_list = query.all()
rules = list(map(lambda x: x.rule, ref_list))
if not rules or value not in rules:
- LOG.info("add_rule IN IF")
+ logger.info("add_rule IN IF")
ref = Rule.from_dict(
{
"id": uuid4().hex,
# license which can be found in the file 'LICENSE' in this package distribution
# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
-from oslo_log import log as logging
-from oslo_config import cfg
+import logging
from stevedore.driver import DriverManager
from python_moonutilities import configuration
from python_moondb.api import model, policy, pdp, keystone
-CONF = cfg.CONF
-LOG = logging.getLogger("moon.db")
+logger = logging.getLogger("moon.db")
class Driver(DriverManager):
def __init__(self, driver_name, engine_name):
- LOG.info("initialization of Driver {}".format(driver_name))
+ logger.info("initialization of Driver {}".format(driver_name))
super(Driver, self).__init__(
namespace='moon_db.driver',
name=driver_name,
sqlalchemy
pymysql
requests
-oslo.log
-oslo.config
"moon_db.driver":
[
"sql = python_moondb.backends.sql:SQLConnector",
- "flat = python_moondb.backends.flat:LogConnector",
],
'console_scripts': [
'moon_db_manager = python_moondb.db_manager:run',
Code Review / moon.git / commitdiff