netbox-secrets 3.1.3__tar.gz → 3.2.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (90) hide show
  1. {netbox_secrets-3.1.3/netbox_secrets.egg-info → netbox_secrets-3.2.0}/PKG-INFO +2 -1
  2. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/README.md +1 -0
  3. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/__init__.py +2 -2
  4. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/graphql/filters.py +3 -2
  5. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/graphql/types.py +8 -4
  6. netbox_secrets-3.2.0/netbox_secrets/migrations/0012_ltree_paths.py +142 -0
  7. netbox_secrets-3.2.0/netbox_secrets/migrations/0013_alter_owner_related_name.py +37 -0
  8. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/models/secrets.py +10 -3
  9. netbox_secrets-3.2.0/netbox_secrets/templates/netbox_secrets/secret_data.html +16 -0
  10. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_api.py +57 -1
  11. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_views.py +34 -13
  12. netbox_secrets-3.2.0/netbox_secrets/ui/__init__.py +0 -0
  13. netbox_secrets-3.2.0/netbox_secrets/ui/panels.py +17 -0
  14. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/views.py +54 -9
  15. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0/netbox_secrets.egg-info}/PKG-INFO +2 -1
  16. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets.egg-info/SOURCES.txt +5 -2
  17. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/setup.py +1 -1
  18. netbox_secrets-3.1.3/netbox_secrets/templates/netbox_secrets/secret.html +0 -85
  19. netbox_secrets-3.1.3/netbox_secrets/templates/netbox_secrets/secretrole.html +0 -11
  20. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/LICENSE.md +0 -0
  21. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/MANIFEST.in +0 -0
  22. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/__init__.py +0 -0
  23. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/serializers.py +0 -0
  24. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/serializers_/__init__.py +0 -0
  25. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/serializers_/keys.py +0 -0
  26. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/serializers_/nested.py +0 -0
  27. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/serializers_/secrets.py +0 -0
  28. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/urls.py +0 -0
  29. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/api/views.py +0 -0
  30. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/constants.py +0 -0
  31. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/exceptions.py +0 -0
  32. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/filtersets.py +0 -0
  33. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/forms/__init__.py +0 -0
  34. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/forms/bulk_edit.py +0 -0
  35. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/forms/bulk_import.py +0 -0
  36. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/forms/filterset.py +0 -0
  37. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/forms/model_forms.py +0 -0
  38. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/graphql/__init__.py +0 -0
  39. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/graphql/schema.py +0 -0
  40. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/hashers.py +0 -0
  41. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0001_initial.py +0 -0
  42. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0002_populate_userkeys.py +0 -0
  43. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0003_populate_secretroles.py +0 -0
  44. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0004_populate_secrets.py +0 -0
  45. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0005_alter_secret_custom_field_data_and_more.py +0 -0
  46. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0006_alter_userkey_created_alter_userkey_last_updated.py +0 -0
  47. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0007_secret__object_repr_secret_comments_and_more.py +0 -0
  48. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0008_userkey_custom_field_data_userkey_tags.py +0 -0
  49. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0009_secret_owner_secretrole_level_secretrole_lft_and_more.py +0 -0
  50. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0010_secret_role_rebuild.py +0 -0
  51. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/0011_remove_redundant_indexes.py +0 -0
  52. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/migrations/__init__.py +0 -0
  53. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/models/__init__.py +0 -0
  54. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/models/keys.py +0 -0
  55. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/navigation.py +0 -0
  56. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/querysets.py +0 -0
  57. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/signals.py +0 -0
  58. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tables.py +0 -0
  59. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/template_content.py +0 -0
  60. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/activate_keys.html +0 -0
  61. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/inc/private_key_modal.html +0 -0
  62. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/inc/secret_actions.html +0 -0
  63. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/inc/secret_add_button.html +0 -0
  64. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/inc/secrets_inline_js.html +0 -0
  65. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/inc/secrets_panel.html +0 -0
  66. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/secret_edit.html +0 -0
  67. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/userkey.html +0 -0
  68. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/userkey_edit.html +0 -0
  69. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/templates/netbox_secrets/userkey_list.html +0 -0
  70. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/__init__.py +0 -0
  71. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/constants.py +0 -0
  72. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_filters.py +0 -0
  73. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_forms.py +0 -0
  74. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_hashers.py +0 -0
  75. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_models.py +0 -0
  76. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_signals.py +0 -0
  77. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_template_content.py +0 -0
  78. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/tests/test_utils.py +0 -0
  79. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/urls.py +0 -0
  80. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/utils/__init__.py +0 -0
  81. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/utils/crypto.py +0 -0
  82. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/utils/hashers.py +0 -0
  83. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets/utils/helpers.py +0 -0
  84. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets.egg-info/dependency_links.txt +0 -0
  85. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets.egg-info/not-zip-safe +0 -0
  86. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets.egg-info/requires.txt +0 -0
  87. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/netbox_secrets.egg-info/top_level.txt +0 -0
  88. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/pyproject.toml +0 -0
  89. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/requirements.txt +0 -0
  90. {netbox_secrets-3.1.3 → netbox_secrets-3.2.0}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: netbox-secrets
3
- Version: 3.1.3
3
+ Version: 3.2.0
4
4
  Summary: Enhance your secret management with encrypted storage and flexible, user-friendly features.
5
5
  Home-page: https://github.com/Onemind-Services-LLC/netbox-secrets/
6
6
  Author: Abhimanyu Saharan
@@ -58,6 +58,7 @@ with end-to-end encryption. Secrets are encrypted at rest and can be assigned to
58
58
  | 4.4.x | 2.4.x |
59
59
  | 4.5.x | 3.0.x |
60
60
  | 4.6.x | 3.1.x |
61
+ | 4.7.1 | 3.2.x |
61
62
 
62
63
  ## Quickstart
63
64
  - Setup (installation + configuration): [docs/installation.md](docs/installation.md)
@@ -27,6 +27,7 @@ with end-to-end encryption. Secrets are encrypted at rest and can be assigned to
27
27
  | 4.4.x | 2.4.x |
28
28
  | 4.5.x | 3.0.x |
29
29
  | 4.6.x | 3.1.x |
30
+ | 4.7.1 | 3.2.x |
30
31
 
31
32
  ## Quickstart
32
33
  - Setup (installation + configuration): [docs/installation.md](docs/installation.md)
@@ -13,8 +13,8 @@ class NetBoxSecrets(PluginConfig):
13
13
  author = metadata.get('Author')
14
14
  author_email = metadata.get('Author-email')
15
15
  base_url = 'secrets'
16
- min_version = '4.6.0'
17
- max_version = '4.6.99'
16
+ min_version = '4.7.1'
17
+ max_version = '4.7.99'
18
18
  required_settings = []
19
19
  default_settings = {
20
20
  'apps': ['dcim.device', 'virtualization.virtualmachine'],
@@ -8,6 +8,7 @@ from strawberry_django import StrFilterLookup
8
8
  from netbox.graphql.filters import (
9
9
  OrganizationalModelFilter,
10
10
  PrimaryModelFilter,
11
+ register_filter,
11
12
  )
12
13
  from tenancy.graphql.filter_mixins import ContactFilterMixin
13
14
  from ..models import *
@@ -21,7 +22,7 @@ __all__ = [
21
22
  ]
22
23
 
23
24
 
24
- @strawberry_django.filter_type(SecretRole, lookups=True)
25
+ @register_filter(SecretRole, lookups=True)
25
26
  class SecretRoleFilter(OrganizationalModelFilter):
26
27
  parent: Annotated[
27
28
  'SecretRoleFilter', strawberry.lazy('netbox_secrets.graphql.filters')
@@ -35,7 +36,7 @@ class SecretRoleFilter(OrganizationalModelFilter):
35
36
  ] | None = strawberry_django.filter_field()
36
37
 
37
38
 
38
- @strawberry_django.filter_type(Secret, lookups=True)
39
+ @register_filter(Secret, lookups=True)
39
40
  class SecretFilter(PrimaryModelFilter, ContactFilterMixin):
40
41
  name: StrFilterLookup[str] | None = strawberry_django.filter_field()
41
42
  role: Annotated[
@@ -5,7 +5,11 @@ import strawberry_django
5
5
  from strawberry.scalars import ID
6
6
 
7
7
  from extras.graphql.mixins import ContactsMixin
8
- from netbox.graphql.types import NestedGroupObjectType, PrimaryObjectType
8
+ from netbox.graphql.types import (
9
+ NestedLtreeGroupObjectType,
10
+ PrimaryObjectType,
11
+ register_type,
12
+ )
9
13
  from netbox_secrets.models import Secret, SecretRole
10
14
  from .filters import *
11
15
 
@@ -18,7 +22,7 @@ __all__ = [
18
22
  ]
19
23
 
20
24
 
21
- @strawberry_django.type(Secret, exclude=['ciphertext', 'hash', 'plaintext'], filters=SecretFilter, pagination=True)
25
+ @register_type(Secret, exclude=['ciphertext', 'hash', 'plaintext'], filters=SecretFilter, pagination=True)
22
26
  class SecretType(ContactsMixin, PrimaryObjectType):
23
27
  role: Annotated['SecretRoleType', strawberry.lazy('netbox_secrets.graphql.types')]
24
28
  assigned_object_type: Annotated[
@@ -28,8 +32,8 @@ class SecretType(ContactsMixin, PrimaryObjectType):
28
32
  assigned_object_id: ID | None = strawberry_django.filter_field()
29
33
 
30
34
 
31
- @strawberry_django.type(SecretRole, fields="__all__", filters=SecretRoleFilter, pagination=True)
32
- class SecretRoleType(NestedGroupObjectType):
35
+ @register_type(SecretRole, exclude=['path', 'sort_path'], filters=SecretRoleFilter, pagination=True)
36
+ class SecretRoleType(NestedLtreeGroupObjectType):
33
37
  parent: Annotated['SecretRoleType', strawberry.lazy('netbox_secrets.graphql.types')] | None
34
38
 
35
39
  secrets: List[SecretType]
@@ -0,0 +1,142 @@
1
+ """Migrate SecretRole's hierarchy from django-mptt to PostgreSQL ltree.
2
+
3
+ The supported migration direction is forward. Reversing this migration restores
4
+ the legacy MPTT columns but does not repopulate their values from the parent
5
+ relationships, so it does not reconstruct a valid MPTT tree. Take a database
6
+ backup before applying this migration; do not treat reversing it as a
7
+ data-preserving rollback.
8
+ """
9
+ from django.contrib.postgres.indexes import GistIndex
10
+ from django.contrib.postgres.operations import CreateExtension
11
+ from django.db import migrations, models
12
+
13
+ import netbox.models.ltree
14
+ from utilities.ltree import InstallLtreeTriggers
15
+ from utilities.mptt_to_ltree import assert_paths_populated_sql, populate_paths_sql
16
+
17
+
18
+ class Migration(migrations.Migration):
19
+
20
+ dependencies = [
21
+ ('netbox_secrets', '0011_remove_redundant_indexes'),
22
+ ]
23
+
24
+ operations = [
25
+ # Create the PostgreSQL ltree extension before adding ltree columns and triggers.
26
+ CreateExtension('ltree'),
27
+
28
+ # Switch parent from mptt.fields.TreeForeignKey to django.db.models.ForeignKey.
29
+ migrations.AlterField(
30
+ model_name='secretrole',
31
+ name='parent',
32
+ field=models.ForeignKey(
33
+ blank=True,
34
+ null=True,
35
+ on_delete=models.CASCADE,
36
+ related_name='children',
37
+ to='netbox_secrets.secretrole',
38
+ ),
39
+ ),
40
+
41
+ # Add path (nullable initially).
42
+ migrations.AddField(
43
+ model_name='secretrole',
44
+ name='path',
45
+ field=netbox.models.ltree.LtreeField(
46
+ blank=True,
47
+ editable=False,
48
+ null=True,
49
+ ),
50
+ ),
51
+
52
+ # Add sort_path with natural_sort collation to match name.
53
+ migrations.AddField(
54
+ model_name='secretrole',
55
+ name='sort_path',
56
+ field=models.TextField(
57
+ blank=True,
58
+ default='',
59
+ editable=False,
60
+ db_collation='natural_sort',
61
+ ),
62
+ ),
63
+
64
+ # Install triggers maintaining both path and sort_path.
65
+ InstallLtreeTriggers(
66
+ 'netbox_secrets_secretrole',
67
+ name_column='name',
68
+ ),
69
+
70
+ # Populate path and sort_path for existing rows.
71
+ migrations.RunSQL(
72
+ sql=populate_paths_sql(
73
+ 'netbox_secrets_secretrole',
74
+ sort_path=True,
75
+ ),
76
+ reverse_sql=migrations.RunSQL.noop,
77
+ ),
78
+
79
+ # Fail if any row has a NULL path.
80
+ migrations.RunSQL(
81
+ sql=assert_paths_populated_sql(
82
+ 'netbox_secrets_secretrole',
83
+ ),
84
+ reverse_sql=migrations.RunSQL.noop,
85
+ ),
86
+
87
+ # Make path non-null after successful population.
88
+ migrations.AlterField(
89
+ model_name='secretrole',
90
+ name='path',
91
+ field=netbox.models.ltree.LtreeField(
92
+ blank=True,
93
+ default='',
94
+ editable=False,
95
+ ),
96
+ ),
97
+
98
+ # Use hierarchical ordering.
99
+ migrations.AlterModelOptions(
100
+ name='secretrole',
101
+ options={'ordering': ['sort_path']},
102
+ ),
103
+
104
+ # Drop legacy MPTT columns.
105
+ migrations.RemoveField(
106
+ model_name='secretrole',
107
+ name='lft',
108
+ ),
109
+
110
+ migrations.RemoveField(
111
+ model_name='secretrole',
112
+ name='rght',
113
+ ),
114
+
115
+ migrations.RemoveField(
116
+ model_name='secretrole',
117
+ name='tree_id',
118
+ ),
119
+
120
+ migrations.RemoveField(
121
+ model_name='secretrole',
122
+ name='level',
123
+ ),
124
+
125
+ # GiST index for ltree path queries.
126
+ migrations.AddIndex(
127
+ model_name='secretrole',
128
+ index=GistIndex(
129
+ fields=['path'],
130
+ name='secrets_secretrole_path_gist',
131
+ ),
132
+ ),
133
+
134
+ # B-tree index for sort_path ordering.
135
+ migrations.AddIndex(
136
+ model_name='secretrole',
137
+ index=models.Index(
138
+ fields=['sort_path'],
139
+ name='secrets_sr_sort_path_idx',
140
+ ),
141
+ ),
142
+ ]
@@ -0,0 +1,37 @@
1
+ # Generated by Django 6.1 on 2026-10-13 06:50
2
+
3
+ from django.db import migrations, models
4
+ import django.db.models.deletion
5
+
6
+
7
+ class Migration(migrations.Migration):
8
+
9
+ dependencies = [
10
+ ('netbox_secrets', '0012_ltree_paths'),
11
+ ('users', '0016_default_ordering_indexes'),
12
+ ]
13
+
14
+ operations = [
15
+ migrations.AlterField(
16
+ model_name='secret',
17
+ name='owner',
18
+ field=models.ForeignKey(
19
+ blank=True,
20
+ null=True,
21
+ on_delete=django.db.models.deletion.PROTECT,
22
+ related_name='+',
23
+ to='users.owner',
24
+ ),
25
+ ),
26
+ migrations.AlterField(
27
+ model_name='secretrole',
28
+ name='owner',
29
+ field=models.ForeignKey(
30
+ blank=True,
31
+ null=True,
32
+ on_delete=django.db.models.deletion.PROTECT,
33
+ related_name='+',
34
+ to='users.owner',
35
+ ),
36
+ ),
37
+ ]
@@ -11,10 +11,11 @@ from typing import Optional
11
11
 
12
12
  from Crypto.Cipher import AES
13
13
  from django.contrib.contenttypes.fields import GenericForeignKey
14
+ from django.contrib.postgres.indexes import GistIndex
14
15
  from django.db import models, transaction
15
16
  from django.utils.translation import gettext_lazy as _
16
17
 
17
- from netbox.models import NestedGroupModel, PrimaryModel
18
+ from netbox.models import NestedLtreeGroupModel, PrimaryModel
18
19
  from netbox.models.features import ContactsMixin
19
20
  from utilities.querysets import RestrictedQuerySet
20
21
  from ..hashers import check_secret_hash, make_secret_hash
@@ -25,7 +26,7 @@ __all__ = [
25
26
  ]
26
27
 
27
28
 
28
- class SecretRole(NestedGroupModel):
29
+ class SecretRole(NestedLtreeGroupModel):
29
30
  """
30
31
  Functional classification for secrets (e.g., "Login Credentials", "API Keys").
31
32
 
@@ -48,7 +49,13 @@ class SecretRole(NestedGroupModel):
48
49
  slug = models.SlugField(verbose_name=_('slug'), max_length=100, unique=True)
49
50
 
50
51
  class Meta:
51
- ordering = ['name']
52
+ ordering = [
53
+ 'sort_path',
54
+ ]
55
+ indexes = [
56
+ GistIndex(fields=['path'], name='secrets_secretrole_path_gist'),
57
+ models.Index(fields=['sort_path'], name='secrets_sr_sort_path_idx'),
58
+ ]
52
59
  verbose_name = _('Secret Role')
53
60
  verbose_name_plural = _('Secret Roles')
54
61
 
@@ -0,0 +1,16 @@
1
+ {% extends 'ui/panels/_base.html' %}
2
+ {% block panel_content %}
3
+ <div class="card-body">
4
+ <form id="secret_form">
5
+ {% csrf_token %}
6
+ </form>
7
+ <div class="row">
8
+ <div class="col col-md-2">Secret</div>
9
+ <div class="col col-md-6"><code id="secret_{{ object.pk }}">********</code></div>
10
+ <div class="col col-md-4 text-end noprint">
11
+ {% include 'netbox_secrets/inc/secret_actions.html' %}
12
+ </div>
13
+ </div>
14
+ </div>
15
+ {% include 'netbox_secrets/inc/private_key_modal.html' %}
16
+ {% endblock %}
@@ -17,7 +17,8 @@ from netbox_secrets.constants import SESSION_COOKIE_NAME
17
17
  from netbox_secrets.hashers import SecretValidationHasher
18
18
  from netbox_secrets.models import Secret, SecretRole, SessionKey, UserKey
19
19
  from netbox_secrets.tests.constants import PRIVATE_KEY, PUBLIC_KEY
20
- from utilities.testing import APITestCase, TestCase, create_test_device
20
+ from netbox_secrets.graphql.types import SecretRoleType
21
+ from utilities.testing import APITestCase, APIViewTestCases, create_test_device, GraphQLQueryTest, TestCase
21
22
 
22
23
 
23
24
  class SerializerTestCase(TestCase):
@@ -177,6 +178,61 @@ class BaseAPITestCase(APITestCase):
177
178
  return session_key, base64.b64encode(session_key.key).decode('utf-8')
178
179
 
179
180
 
181
+ class SecretRoleGraphQLTestCase(APIViewTestCases.GraphQLTestCase):
182
+ model = SecretRole
183
+ type_class = SecretRoleType
184
+
185
+ # This test focuses on the hierarchy-related GraphQL field.
186
+ graphql_auto_filter_tests = False
187
+
188
+ @classmethod
189
+ def setUpTestData(cls):
190
+ cls.parent = SecretRole.objects.create(
191
+ name='Parent Role',
192
+ slug='parent-role',
193
+ )
194
+ cls.child = SecretRole.objects.create(
195
+ name='Child Role',
196
+ slug='child-role',
197
+ parent=cls.parent,
198
+ )
199
+
200
+ cls.graphql_query_tests = (
201
+ GraphQLQueryTest(
202
+ name='secret_role_levels',
203
+ query=f"""
204
+ {{
205
+ secret_role(id: {cls.parent.pk}) {{
206
+ name
207
+ level
208
+ children {{
209
+ name
210
+ level
211
+ }}
212
+ }}
213
+ }}
214
+ """,
215
+ assert_result=cls.assert_secret_role_levels,
216
+ ),
217
+ )
218
+
219
+ def assert_secret_role_levels(self, data):
220
+ parent = data['secret_role']
221
+
222
+ self.assertEqual(parent['name'], self.parent.name)
223
+ self.assertEqual(parent['level'], 0)
224
+
225
+ self.assertEqual(
226
+ parent['children'],
227
+ [
228
+ {
229
+ 'name': self.child.name,
230
+ 'level': 1,
231
+ }
232
+ ],
233
+ )
234
+
235
+
180
236
  class SecretsRootAPITestCase(BaseAPITestCase):
181
237
  def test_root(self):
182
238
  url = reverse('plugins-api:netbox_secrets-api:api-root')
@@ -51,22 +51,43 @@ class SecretRoleViewTestCase(TestCase):
51
51
  queryset = view.get_children(request, role)
52
52
  self.assertIn(secret, list(queryset))
53
53
 
54
- def test_secret_view_extra_context(self):
55
- role = SecretRole.objects.create(name='Role2', slug='role2')
56
- device = create_test_device('device-view-2')
57
- secret = Secret.objects.create(
58
- assigned_object_type=ContentType.objects.get_for_model(device),
59
- assigned_object_id=device.pk,
60
- role=role,
61
- name='secret2',
54
+ def test_secret_role_view(self):
55
+ url = reverse('plugins:netbox_secrets:secretrole', kwargs={'pk': self.parent.pk})
56
+ response = self.client.get(url)
57
+
58
+ self.assertHttpStatus(response, 200)
59
+ self.assertContains(response, self.parent.name)
60
+ self.assertContains(response, 'Child Roles')
61
+
62
+
63
+ class SecretViewTestCase(TestCase):
64
+ user_permissions = (
65
+ 'netbox_secrets.view_secret',
66
+ 'netbox_secrets.view_secretrole',
67
+ )
68
+
69
+ @classmethod
70
+ def setUpTestData(cls):
71
+ cls.role = SecretRole.objects.create(name='Role', slug='role')
72
+ cls.device = create_test_device('device-view')
73
+
74
+ cls.secret = Secret.objects.create(
75
+ assigned_object_type=ContentType.objects.get_for_model(cls.device),
76
+ assigned_object_id=cls.device.pk,
77
+ role=cls.role,
78
+ name='Test Secret',
62
79
  ciphertext=b'0123456789abcdef' * 5,
63
80
  hash='dummy',
64
81
  )
65
- request = RequestFactory().get('/')
66
- request.user = self.user
67
- view = plugin_views.SecretView()
68
- ctx = view.get_extra_context(request, secret)
69
- self.assertIn('related_models', ctx)
82
+
83
+ def test_secret_view(self):
84
+ url = reverse('plugins:netbox_secrets:secret', kwargs={'pk': self.secret.pk})
85
+ response = self.client.get(url)
86
+
87
+ self.assertHttpStatus(response, 200)
88
+ self.assertContains(response, self.secret.name)
89
+ self.assertContains(response, self.role.name)
90
+ self.assertContains(response, 'Secret Data')
70
91
 
71
92
 
72
93
  class SecretEditViewAccessTestCase(TestCase):
File without changes
@@ -0,0 +1,17 @@
1
+ from django.utils.translation import gettext_lazy as _
2
+ from netbox.ui import attrs, panels
3
+
4
+
5
+ class SecretPanel(panels.ObjectAttributesPanel):
6
+ title = _('Secret Attributes')
7
+
8
+ assigned_object = attrs.RelatedObjectAttr('assigned_object', linkify=True)
9
+ role = attrs.RelatedObjectAttr('role', linkify=True)
10
+ name = attrs.TextAttr('name')
11
+ description = attrs.TextAttr('description')
12
+
13
+
14
+ class SecretDataViewPanel(panels.ObjectPanel):
15
+ title = _('Secret Data')
16
+
17
+ template_name = 'netbox_secrets/secret_data.html'
@@ -14,8 +14,14 @@ from django.views.generic.base import View
14
14
 
15
15
  from core.signals import clear_events
16
16
  from extras.ui.panels import CustomFieldsPanel, TagsPanel
17
- from netbox.object_actions import AddObject, BulkDelete, BulkEdit, BulkExport
17
+ from netbox.object_actions import (
18
+ AddObject,
19
+ BulkDelete,
20
+ BulkEdit,
21
+ BulkExport,
22
+ )
18
23
  from netbox.ui import actions, layout
24
+ from netbox.ui.breadcrumbs import Breadcrumb, filtered_list_url
19
25
  from netbox.ui.panels import (
20
26
  CommentsPanel,
21
27
  NestedGroupObjectPanel,
@@ -26,10 +32,16 @@ from netbox.views import generic
26
32
  from utilities.exceptions import AbortRequest, PermissionsViolation
27
33
  from utilities.forms import restrict_form_fields
28
34
  from utilities.querydict import prepare_cloned_fields
29
- from utilities.views import GetRelatedModelsMixin, GetReturnURLMixin, ViewTab, register_model_view
35
+ from utilities.views import (
36
+ GetRelatedModelsMixin,
37
+ GetReturnURLMixin,
38
+ ViewTab,
39
+ register_model_view,
40
+ )
30
41
  from . import exceptions, filtersets, forms, tables, utils
31
42
  from .constants import get_public_key_size
32
43
  from .models import Secret, SecretRole, SessionKey, UserKey
44
+ from .ui.panels import SecretDataViewPanel, SecretPanel
33
45
 
34
46
 
35
47
  #
@@ -49,10 +61,24 @@ class SecretRoleListView(generic.ObjectListView):
49
61
 
50
62
  @register_model_view(SecretRole)
51
63
  class SecretRoleView(GetRelatedModelsMixin, generic.ObjectView):
64
+ template_name = 'generic/object.html'
52
65
  queryset = SecretRole.objects.all()
53
66
  layout = layout.SimpleLayout(
54
- left_panels=[NestedGroupObjectPanel(), TagsPanel(), CommentsPanel()],
55
- right_panels=[RelatedObjectsPanel(), CustomFieldsPanel()],
67
+ breadcrumbs=[
68
+ Breadcrumb(
69
+ lambda o: o.get_ancestors(),
70
+ url=filtered_list_url('plugins:netbox_secrets:secretrole_list', 'parent_id'),
71
+ ),
72
+ ],
73
+ left_panels=[
74
+ NestedGroupObjectPanel(),
75
+ TagsPanel(),
76
+ CommentsPanel(),
77
+ ],
78
+ right_panels=[
79
+ RelatedObjectsPanel(),
80
+ CustomFieldsPanel(),
81
+ ],
56
82
  bottom_panels=[
57
83
  ObjectsTablePanel(
58
84
  'netbox_secrets.secretrole',
@@ -154,13 +180,32 @@ class SecretListView(generic.ObjectListView):
154
180
 
155
181
 
156
182
  @register_model_view(Secret)
157
- class SecretView(GetRelatedModelsMixin, generic.ObjectView):
183
+ class SecretView(generic.ObjectView):
158
184
  queryset = Secret.objects.all()
159
185
 
160
- def get_extra_context(self, request, instance):
161
- return {
162
- 'related_models': self.get_related_models(request, instance),
163
- }
186
+ template_name = 'generic/object.html'
187
+ layout = layout.SimpleLayout(
188
+ breadcrumbs=[
189
+ Breadcrumb(
190
+ 'role',
191
+ url=filtered_list_url(
192
+ 'plugins:netbox_secrets:secret_list',
193
+ 'role_id',
194
+ ),
195
+ ),
196
+ Breadcrumb('assigned_object'),
197
+ Breadcrumb(label=lambda obj: str(obj)),
198
+ ],
199
+ left_panels=[
200
+ SecretPanel(),
201
+ CustomFieldsPanel(),
202
+ ],
203
+ right_panels=[
204
+ SecretDataViewPanel(),
205
+ TagsPanel(),
206
+ CommentsPanel(),
207
+ ],
208
+ )
164
209
 
165
210
 
166
211
  @register_model_view(Secret, 'add', detail=False)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: netbox-secrets
3
- Version: 3.1.3
3
+ Version: 3.2.0
4
4
  Summary: Enhance your secret management with encrypted storage and flexible, user-friendly features.
5
5
  Home-page: https://github.com/Onemind-Services-LLC/netbox-secrets/
6
6
  Author: Abhimanyu Saharan
@@ -58,6 +58,7 @@ with end-to-end encryption. Secrets are encrypted at rest and can be assigned to
58
58
  | 4.4.x | 2.4.x |
59
59
  | 4.5.x | 3.0.x |
60
60
  | 4.6.x | 3.1.x |
61
+ | 4.7.1 | 3.2.x |
61
62
 
62
63
  ## Quickstart
63
64
  - Setup (installation + configuration): [docs/installation.md](docs/installation.md)
@@ -50,14 +50,15 @@ netbox_secrets/migrations/0008_userkey_custom_field_data_userkey_tags.py
50
50
  netbox_secrets/migrations/0009_secret_owner_secretrole_level_secretrole_lft_and_more.py
51
51
  netbox_secrets/migrations/0010_secret_role_rebuild.py
52
52
  netbox_secrets/migrations/0011_remove_redundant_indexes.py
53
+ netbox_secrets/migrations/0012_ltree_paths.py
54
+ netbox_secrets/migrations/0013_alter_owner_related_name.py
53
55
  netbox_secrets/migrations/__init__.py
54
56
  netbox_secrets/models/__init__.py
55
57
  netbox_secrets/models/keys.py
56
58
  netbox_secrets/models/secrets.py
57
59
  netbox_secrets/templates/netbox_secrets/activate_keys.html
58
- netbox_secrets/templates/netbox_secrets/secret.html
60
+ netbox_secrets/templates/netbox_secrets/secret_data.html
59
61
  netbox_secrets/templates/netbox_secrets/secret_edit.html
60
- netbox_secrets/templates/netbox_secrets/secretrole.html
61
62
  netbox_secrets/templates/netbox_secrets/userkey.html
62
63
  netbox_secrets/templates/netbox_secrets/userkey_edit.html
63
64
  netbox_secrets/templates/netbox_secrets/userkey_list.html
@@ -77,6 +78,8 @@ netbox_secrets/tests/test_signals.py
77
78
  netbox_secrets/tests/test_template_content.py
78
79
  netbox_secrets/tests/test_utils.py
79
80
  netbox_secrets/tests/test_views.py
81
+ netbox_secrets/ui/__init__.py
82
+ netbox_secrets/ui/panels.py
80
83
  netbox_secrets/utils/__init__.py
81
84
  netbox_secrets/utils/crypto.py
82
85
  netbox_secrets/utils/hashers.py
@@ -33,7 +33,7 @@ def read_requirements(path: str) -> list[str]:
33
33
 
34
34
  setup(
35
35
  name='netbox-secrets',
36
- version='3.1.3',
36
+ version='3.2.0',
37
37
  description=description,
38
38
  long_description=long_description,
39
39
  long_description_content_type="text/markdown",
@@ -1,85 +0,0 @@
1
- {% extends 'generic/object.html' %}
2
- {% load buttons %}
3
- {% load helpers %}
4
- {% load static %}
5
- {% load plugins %}
6
-
7
- {% block breadcrumbs %}
8
- <li class="breadcrumb-item">
9
- <a href="{% url 'plugins:netbox_secrets:secret_list' %}">Secrets</a>
10
- </li>
11
- <li class="breadcrumb-item">
12
- <a href="{% url 'plugins:netbox_secrets:secret_list' %}?role_id={{ object.role.pk }}">{{ object.role }}</a>
13
- </li>
14
- <li class="breadcrumb-item">
15
- <a href="{{ object.assigned_object.get_absolute_url }}">{{ object.assigned_object }}</a>
16
- </li>
17
- <li class="breadcrumb-item">{{ object }}</li>
18
- {% endblock %}
19
-
20
- {% block content %}
21
- <div class="row">
22
- <div class="col col-md-6">
23
- <div class="card">
24
- <h5 class="card-header">
25
- Secret Attributes
26
- </h5>
27
- <div class="card-body">
28
- <table class="table table-hover attr-table">
29
- <tr>
30
- <th scope="row">Assigned Object</th>
31
- <td>
32
- <a href="{{ object.assigned_object.get_absolute_url }}">{{ object.assigned_object }}</a>
33
- </td>
34
- </tr>
35
- <tr>
36
- <th scope="row">Role</th>
37
- <td>
38
- <a href="{{ object.role.get_absolute_url }}">{{ object.role }}</a>
39
- </td>
40
- </tr>
41
- <tr>
42
- <th scope="row">Name</th>
43
- <td>{{ object.name|placeholder }}</td>
44
- </tr>
45
- <tr>
46
- <th scope="row">Description</th>
47
- <td>{{ object.description|placeholder }}</td>
48
- </tr>
49
- </table>
50
- </div>
51
- </div>
52
- {% include 'inc/panels/custom_fields.html' %}
53
- {% plugin_left_page object %}
54
- </div>
55
- <div class="col col-md-6">
56
- <div class="card">
57
- <h5 class="card-header">
58
- Secret Data
59
- </h5>
60
- <div class="card-body">
61
- <form id="secret_form">
62
- {% csrf_token %}
63
- </form>
64
- <div class="row">
65
- <div class="col col-md-2">Secret</div>
66
- <div class="col col-md-6"><code id="secret_{{ object.pk }}">********</code></div>
67
- <div class="col col-md-4 text-end noprint">
68
- {% include 'netbox_secrets/inc/secret_actions.html' %}
69
- </div>
70
- </div>
71
- </div>
72
- </div>
73
- {% include 'inc/panels/tags.html' %}
74
- {% include 'inc/panels/comments.html' %}
75
- {% plugin_right_page object %}
76
- </div>
77
- </div>
78
- <div class="row">
79
- <div class="col col-md-12">
80
- {% plugin_full_width_page object %}
81
- </div>
82
- </div>
83
-
84
- {% include 'netbox_secrets/inc/private_key_modal.html' %}
85
- {% endblock %}
@@ -1,11 +0,0 @@
1
- {% extends 'generic/object.html' %}
2
- {% load i18n %}
3
-
4
- {% block breadcrumbs %}
5
- {{ block.super }}
6
- {% for secretrole in object.get_ancestors %}
7
- <li class="breadcrumb-item"><a
8
- href="{% url 'plugins:netbox_secrets:secretrole_list' %}?parent_id={{ secretrole.pk }}">{{ secretrole }}</a>
9
- </li>
10
- {% endfor %}
11
- {% endblock %}
File without changes