Skip to content

fix: lazy init and recursion fixes #35

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

Open
vimzoomer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: lazy init and recursion fixes #35

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ Based on [Officially Supported Databases](https://docs.djangoproject.com/en/3.0/
pip install casbin-django-orm-adapter
```

Add `casbin_adapter.apps.CasbinAdapterConfig` to your `INSTALLED_APPS`
Add `casbin_adapter` to your `INSTALLED_APPS`

```python
# settings.py
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

INSTALLED_APPS = [
...
'casbin_adapter.apps.CasbinAdapterConfig',
'casbin_adapter',
...
]

Expand Down
6 changes: 0 additions & 6 deletions casbin_adapter/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@

class CasbinAdapterConfig(AppConfig):
name = "casbin_adapter"

def ready(self):
from .enforcer import initialize_enforcer

db_alias = getattr(settings, "CASBIN_DB_ALIAS", "default")
initialize_enforcer(db_alias)
6 changes: 3 additions & 3 deletions casbin_adapter/enforcer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

class ProxyEnforcer(Enforcer):
_initialized = False
db_alias = "default"
db_alias = getattr(settings, "CASBIN_DB_ALIAS", "default")

def __init__(self, *args, **kwargs):
if self._initialized:
Expand Down Expand Up @@ -43,9 +43,9 @@ def _load(self):
self.set_role_manager(role_manager)

def __getattribute__(self, name):
safe_methods = ["__init__", "_load", "_initialized"]
safe_methods = ["__init__", "_load", "_initialized", "__class__"]
if not super().__getattribute__("_initialized") and name not in safe_methods:
initialize_enforcer(self.db_alias)
initialize_enforcer(super().__getattribute__("db_alias"))
if not super().__getattribute__("_initialized"):
raise Exception(
(
Expand Down