mirror/peeringdb-peeringdb
1
0
Fork 0
mirror of https://github.com/peeringdb/peeringdb.git synced 2024-05-11 05:55:09 +00:00
Code Releases Activity

Support 202011 (#917)

Browse Source 
* install django-grainy

* nsp to grainy first iteration

* Fix validation error message overflow

* Add migration, update views.py and template to add help_text to UI

* nsp to grainy second iteration

* grainy and django-grainy pinned to latest releases

* deskpro ticket cc (#875)

* black formatting

* move ac link to bottom for ticket body

* Fix typo

* Update djangorestframework, peeringdb, django-ratelimit

* Rewrite login view ratelimit decorator

* Relock pipfile

* add list() to make copy of dictionaries before iterating

* respect ix-f url visibilty in ix-f conflict emails

* Add type coercion to settings taken from environment variables

* Add bool handling

* relock pipfile with python3.9
change docker to use python3.9

* Check bool via isinstance

* add ordering to admin search queryset for deskproticket and email

* update settings with envvar_type option

* Add tooltips to add ix and add exchange views (in org)

* Add tooltip to suggest fac view

* get phone information in view

* add missing migration

* add migration and make org a geo model

* Wire normalization to put/create requests for Facility

* Update admin with new address fields

* Refactor serializer using mixin

* Add floor and suite to address API

* Write command to geonormalize existing entries

* Remove unnecessary method from model

* Add floor and suite to views

* Add ignore geo status

* Force refresh for fac and org updates

* adjust frontend typo

* add checking if update needs geosync

* redo error handling for geosync

* remove save keyword from geonormalize command script

* change raw_id_fields

* alternate autocomplete lookup field depending on where inline is called

* remove unnecessary error handling

* Add  csv option

* Fix bug
 with None vs empty string

* add regex parsing for suite and floor conversion

* Add migration that removes geo error as a field

* add geostatus update to command

* Ignore suite floor and address2 changes for api normalization

* update geomodel by removing geo_error

* Black models.py

* Black serializers.py

* remove geocode error from admin

* Add function for reversing pretty speed

* add conversion to export method

* fix typo

* fix speed value feedback after submit

* remove conditional

* Add error handling to create endpoint

* Refine floor and suite parsing regex

* Add geocoding tests

* Add json for tests

* IX-F Importer: Bogus output of "Preview" tool #896

* remove cruft

* black formatting

* IX-F Importer: history of changes per ixlan & netixlan #893

* 6 add geocode to org view

* 4 update geocode without refresh

* Update error display

* Fix bug with formatting translated string

* Add DateTimeFields to model

* Add update signals

* add last updated fields to views and serializers

* Add last updated model migration

* Add the data migration for last updated fields

* add test that tests a normal org user with create org permissions

* grainy to 1.7
django grainy to 1.9.1

* Fix formatting issues

* Adjust var names

* Refactor signals

* Temporary: save override from network model

* Empty vlan lists no longer cause error

* typo in ixf.py

* typo in admin

* Typos in model verbose names

* Add serializer IXLAN validation for ixf_ixp_import_enabled

* Add model validation to IXLan

* relock pipfile

* relock pipfile

* begin signal test file

* Remove full clean from save in ixlan

* use post_reversion_commit signal instead

* remove redundant save override

* remove cruft / debug code

* Add signal tests

* exclude organizations with city missing from commandline geosync

* Skip geosync if the only address information we have is a country

* initial commit for vlan matcher in importer

* Add more tests and remove unused imports

* update tests

* Actually add vlan matching to importer

* Add type checking for speed list and state

* Change how we register connection.state

* add bootstrap options

* add rdap cache command

* remove outdated perm docs

* rdap from master and relock

* propagate rdap settings to peeringdb.settings

* add loaddata for initial fixtures

* user friendly error message on RdapNotFound errors (#497)

* update rdap errors

* django-peeringdb to 2.5.0 and relock

* rdap to 1.2.0 and relock

* fix migration hierarchy

* add ignore_recurse_errors option

* add missing fields to mock
remove cruft missed during merge

* rdap to 1.2.1

* dont geo validate during api tests

* fix tests

* Add test file

* fix merge

* RDAP_SELF_BOOTSTRAP to False while running tests

* black formatted

* run black

* add github actions

* add runs on

Co-authored-by: Stefan Pratter <stefan@20c.com>
Co-authored-by: Elliot Frank <elliot@20c.com>
This commit is contained in:
Matt Griswold
2021-01-13 20:35:07 +00:00
committed by GitHub
parent 6c390706ce
commit b07baf3092
120 changed files with 5413 additions and 1440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
peeringdb_server/org_admin_views.py
View File

@@ -8,6 +8,16 @@ from django.template import loader
from django.conf import settings
from .forms import OrgAdminUserPermissionForm
from grainy.const import *
from django_grainy.models import UserPermission
from django_namespace_perms.constants import *
from django_handleref.models import HandleRefModel
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import override
from peeringdb_server.util import check_permissions
from peeringdb_server.models import (
User,
Organization,
@@ -18,15 +28,6 @@ from peeringdb_server.models import (
UserOrgAffiliationRequest,
)
import django_namespace_perms.util as nsp
from django_namespace_perms.constants import *
from django_namespace_perms.models import UserPermission
from django_handleref.models import HandleRefModel
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import override
def save_user_permissions(org, user, perms):
"""
@@ -37,11 +38,11 @@ def save_user_permissions(org, user, perms):
# wipe all the user's perms for the targeted org
user.userpermission_set.filter(namespace__startswith=org.nsp_namespace).delete()
user.grainy_permissions.filter(namespace__startswith=org.grainy_namespace).delete()
# collect permissioning namespaces from the provided permissioning ids
nsp_perms = {}
grainy_perms = {}
for id, permissions in list(perms.items()):
@@ -49,44 +50,38 @@ def save_user_permissions(org, user, perms):
permissions = permissions | PERM_READ
if id == "org.%d" % org.id:
nsp_perms[org.nsp_namespace] = permissions
nsp_perms[
NetworkContact.nsp_namespace_from_id(org.id, "*", "private")
grainy_perms[org.grainy_namespace] = permissions
grainy_perms[
f"{org.grainy_namespace}.network.*.poc_set.private"
] = permissions
elif id == "net":
nsp_perms[
Network.nsp_namespace_from_id(org.id, "*").strip(".*")
] = permissions
nsp_perms[
NetworkContact.nsp_namespace_from_id(org.id, "*", "private")
grainy_perms[f"{org.grainy_namespace}.network"] = permissions
grainy_perms[
f"{org.grainy_namespace}.network.*.poc_set.private"
] = permissions
elif id == "ix":
nsp_perms[
InternetExchange.nsp_namespace_from_id(org.id, "*").strip(".*")
] = permissions
grainy_perms[f"{org.grainy_namespace}.internetexchange"] = permissions
elif id == "fac":
nsp_perms[
Facility.nsp_namespace_from_id(org.id, "*").strip(".*")
] = permissions
grainy_perms[f"{org.grainy_namespace}.facility"] = permissions
elif id.find(".") > -1:
id = id.split(".")
if id[0] == "net":
nsp_perms[Network.nsp_namespace_from_id(org.id, id[1])] = permissions
nsp_perms[
NetworkContact.nsp_namespace_from_id(org.id, id[1], "private")
grainy_perms[f"{org.grainy_namespace}.network.{id[1]}"] = permissions
grainy_perms[
f"{org.grainy_namespace}.network.{id[1]}.poc_set.private"
] = permissions
elif id[0] == "ix":
nsp_perms[
InternetExchange.nsp_namespace_from_id(org.id, id[1])
grainy_perms[
f"{org.grainy_namespace}.internetexchange.{id[1]}"
] = permissions
elif id[0] == "fac":
nsp_perms[Facility.nsp_namespace_from_id(org.id, id[1])] = permissions
grainy_perms[f"{org.grainy_namespace}.facility.{id[1]}"] = permissions
# save
for ns, p in list(nsp_perms.items()):
UserPermission.objects.create(namespace=ns, permissions=p, user=user)
for ns, p in list(grainy_perms.items()):
UserPermission.objects.create(namespace=ns, permission=p, user=user)
return nsp_perms
return grainy_perms
def load_all_user_permissions(org):
@@ -113,20 +108,22 @@ def load_user_permissions(org, user):
# load all of the user's permissions related to this org
uperms = {
p.namespace: p.permissions
for p in user.userpermission_set.filter(namespace__startswith=org.nsp_namespace)
p.namespace: p.permission
for p in user.grainy_permissions.filter(
namespace__startswith=org.grainy_namespace
)
}
perms = {}
extract_permission_id(uperms, perms, org, org)
# extract user's permissioning ids from nsp_namespaces targeting
# extract user's permissioning ids from grainy_namespaces targeting
# organization's entities
for model in [Network, InternetExchange, Facility]:
extract_permission_id(uperms, perms, model, org)
# extract user's permissioning ids from nsp_namespaces targeting
# extract user's permissioning ids from grainy_namespaces targeting
# organization's entities by their id (eg user has perms only
# to THAT specific network)
for net in org.net_set_active:
@@ -197,12 +194,14 @@ def extract_permission_id(source, dest, entity, org):
if isinstance(entity, HandleRefModel):
# instance
k = entity.nsp_namespace
k = entity.grainy_namespace
j = "%s.%d" % (entity.ref_tag, entity.id)
else:
# class
k = entity.nsp_namespace_from_id(org.id, "*").strip(".*")
j = entity.handleref.tag
namespace = entity.Grainy.namespace()
k = f"{org.grainy_namespace}.{namespace}"
if k in source:
dest[j] = source[k]
@@ -223,7 +222,7 @@ def org_admin_required(fnc):
try:
org = Organization.objects.get(id=org_id)
if not nsp.has_perms(request.user, org.nsp_namespace_manage, "update"):
if not check_permissions(request.user, org.grainy_namespace_manage, "u"):
return JsonResponse({}, status=403)
kwargs["org"] = org
return fnc(request, **kwargs)