Skip to content
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

Jump to bottom

Fix dependency cycle between galaxy.security and galaxy.model. #7554

Merged
merged 3 commits into from Mar 19, 2019
Merged

Fix dependency cycle between galaxy.security and galaxy.model. #7554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c20743
Fix dependency cycle between galaxy.security and galaxy.model (1/2)
jmchilton Mar 18, 2019
9672395
Refactor security (2/2).
jmchilton Mar 18, 2019
78eed4f
Another fix for security/model cycle fix.
jmchilton Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/galaxy/app.py
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
import time

import galaxy.model
import galaxy.model.security
import galaxy.queues
import galaxy.quota
import galaxy.security
Expand Down Expand Up @@ -154,7 +155,7 @@ def __init__(self, **kwargs):
self.webhooks_registry = WebhooksRegistry(self.config.webhooks_dirs)
# Load security policy.
self.security_agent = self.model.security_agent
self.host_security_agent = galaxy.security.HostAgent(
self.host_security_agent = galaxy.model.security.HostAgent(
model=self.security_agent.model,
permitted_actions=self.security_agent.permitted_actions)
# Load quota management.
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/model/mapping.py
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@
from galaxy.model.custom_types import JSONType, MetadataType, TrimmedString, UUIDType
from galaxy.model.orm.engine_factory import build_engine
from galaxy.model.orm.now import now
from galaxy.security import GalaxyRBACAgent
from galaxy.model.security import GalaxyRBACAgent

log = logging.getLogger(__name__)

Expand Down