Skip to content

Commit

Permalink
Merge 2f2492e into cbff7b8
Browse files Browse the repository at this point in the history
  • Loading branch information
@np5
np5 committed Apr 15, 2024
2 parents cbff7b8 + 2f2492e commit 40b1a21
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 77 deletions.
128 changes: 65 additions & 63 deletions constraints.txt
View file
Original file line number Diff line number Diff line change
@@ -1,99 +1,101 @@
aiohttp==3.9.3
aiohttp==3.9.4
aiosignal==1.3.1
amqp==5.2.0
anyio==4.3.0
asgiref==3.7.2
asgiref==3.8.1
asn1crypto==1.5.1
asttokens==2.4.1
async-timeout==4.0.3
attrs==23.2.0
azure-core==1.30.0
azure-identity==1.15.0
azure-core==1.30.1
azure-identity==1.16.0
billiard==4.2.0
boto3==1.34.48
botocore==1.34.48
cachetools==5.3.2
cbor2==5.6.2
boto3==1.34.84
botocore==1.34.84
cachetools==5.3.3
cbor2==5.6.3
celery==5.3.6
certifi==2024.2.2
cffi==1.16.0
charset-normalizer==3.3.2
click==8.1.7
click-didyoumean==0.3.0
click-didyoumean==0.3.1
click-plugins==1.1.1
click-repl==0.3.0
coverage==7.4.2
cryptography==42.0.4
coverage==7.4.4
cryptography==42.0.5
decorator==5.1.1
defusedxml==0.7.1
Deprecated==1.2.14
Django==4.2.11
django-bootstrap-form==3.4
django-celery-results==2.4.0
django-filter==23.5
django-filter==24.2
django-redis==5.4.0
django-storages==1.14.2
djangorestframework==3.14.0
djangorestframework==3.15.1
djangorestframework-yaml==2.0.0
elastic-transport==8.12.0
elasticsearch==8.12.1
elementpath==4.3.0
elastic-transport==8.13.0
elasticsearch==8.13.0
elementpath==4.4.0
exceptiongroup==1.2.0
executing==2.0.1
filelock==3.13.1
filelock==3.13.4
frozenlist==1.4.1
geoip2==4.8.0
google-api-core==2.17.1
google-auth==2.28.1
google-api-core==2.18.0
google-auth==2.29.0
google-cloud-core==2.4.1
google-cloud-kms==2.21.2
google-cloud-pubsub==2.19.6
google-cloud-secret-manager==2.18.2
google-cloud-storage==2.14.0
google-cloud-kms==2.21.3
google-cloud-pubsub==2.21.1
google-cloud-secret-manager==2.19.0
google-cloud-storage==2.16.0
google-crc32c==1.5.0
google-resumable-media==2.7.0
googleapis-common-protos==1.62.0
googleapis-common-protos==1.63.0
grpc-google-iam-v1==0.13.0
grpcio==1.62.0
grpcio-status==1.62.0
grpcio==1.62.1
grpcio-status==1.62.1
gunicorn==21.2.0
h11==0.14.0
h2==4.1.0
hpack==4.0.0
httpcore==1.0.4
httpcore==1.0.5
httpx==0.27.0
hyperframe==6.0.1
idna==3.6
importlib-metadata==6.11.0
ipython==8.22.1
idna==3.7
importlib-metadata==7.0.0
ipython==8.23.0
jedi==0.19.1
Jinja2==3.1.3
jmespath==1.0.1
josepy==1.14.0
kombu==5.3.5
kombu==5.3.7
MarkupSafe==2.1.5
matplotlib-inline==0.1.6
maxminddb==2.5.2
microsoft-kiota-abstractions==1.2.0
maxminddb==2.6.1
microsoft-kiota-abstractions==1.3.2
microsoft-kiota-authentication-azure==1.0.0
microsoft-kiota-http==1.3.0
microsoft-kiota-serialization-json==1.0.1
microsoft-kiota-http==1.3.1
microsoft-kiota-serialization-form==0.1.0
microsoft-kiota-serialization-json==1.1.0
microsoft-kiota-serialization-multipart==0.1.0
microsoft-kiota-serialization-text==1.0.0
msal==1.27.0
msal==1.28.0
msal-extensions==1.1.0
msgraph-core==1.0.0
msgraph-sdk==1.1.0
msgraph-sdk==1.2.0
multidict==6.0.5
oauthlib==3.2.2
opensearch-py==2.4.2
opentelemetry-api==1.22.0
opentelemetry-sdk==1.22.0
opentelemetry-semantic-conventions==0.43b0
packaging==23.2
parso==0.8.3
opensearch-py==2.5.0
opentelemetry-api==1.24.0
opentelemetry-sdk==1.24.0
opentelemetry-semantic-conventions==0.45b0
packaging==24.0
parso==0.8.4
pendulum==3.0.0
pexpect==4.9.0
platformdirs==3.11.0
platformdirs==4.2.0
portalocker==2.8.2
prometheus_client==0.20.0
prompt-toolkit==3.0.43
Expand All @@ -102,44 +104,44 @@ protobuf==4.25.3
psycopg2==2.9.9
ptyprocess==0.7.0
pure-eval==0.2.2
pyasn1==0.5.1
pyasn1-modules==0.3.0
pycparser==2.21
pyasn1==0.6.0
pyasn1_modules==0.4.0
pycparser==2.22
pycurl==7.45.3
Pygments==2.17.2
PyJWT==2.8.0
pyOpenSSL==24.0.0
pyOpenSSL==24.1.0
pyotp==2.9.0
pysaml2==7.5.0
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
python-ldap==3.4.4
pytz==2024.1
PyYAML==6.0.1
redis==5.0.1
redis==5.0.3
requests==2.31.0
requests-oauthlib==1.3.1
requests-oauthlib==2.0.0
rsa==4.9
s3transfer==0.10.0
s3transfer==0.10.1
six==1.16.0
sniffio==1.3.0
snowflake-connector-python==3.7.1
sniffio==1.3.1
snowflake-connector-python==3.8.1
sortedcontainers==2.4.0
sqlparse==0.4.4
sqlparse==0.5.0
stack-data==0.6.3
std-uritemplate==0.0.53
time-machine==2.13.0
tomlkit==0.12.3
std-uritemplate==0.0.56
time-machine==2.14.1
tomlkit==0.12.4
tqdm==4.66.2
traitlets==5.14.1
typing_extensions==4.9.0
traitlets==5.14.2
typing_extensions==4.11.0
tzdata==2024.1
urllib3==2.0.7
urllib3==1.26.18
vine==5.1.0
wcwidth==0.2.13
webauthn==2.0.0
webauthn==2.1.0
whitenoise==6.6.0
wrapt==1.16.0
XlsxWriter==3.2.0
xmlschema==2.5.1
yarl==1.9.4
zipp==3.17.0
zipp==3.18.1
26 changes: 13 additions & 13 deletions tests/osquery/test_api_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def test_get_atc_not_found(self):
response = self.get(reverse("osquery_api:atc", args=[99999]))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No AutomaticTableConstruction matches the given query."
})

def test_get_atc(self):
Expand Down Expand Up @@ -397,7 +397,7 @@ def test_update_atc_not_found(self):
response = self.put_json_data(reverse("osquery_api:atc", args=[9999]), {})
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No AutomaticTableConstruction matches the given query."
})

def test_update_atc(self):
Expand Down Expand Up @@ -529,7 +529,7 @@ def test_delete_atc_not_found(self):
response = self.delete(reverse("osquery_api:atc", args=[9999]))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No AutomaticTableConstruction matches the given query."
})

def test_delete_atc(self):
Expand Down Expand Up @@ -637,7 +637,7 @@ def test_get_file_category_not_found(self):
response = self.get(reverse("osquery_api:file_category", args=[9999]))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No FileCategory matches the given query."
})

def test_get_file_category(self):
Expand Down Expand Up @@ -713,7 +713,7 @@ def test_update_file_category_not_found(self):
response = self.put_json_data(reverse("osquery_api:file_category", args=[9999]), {})
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No FileCategory matches the given query."
})

def test_update_file_category(self):
Expand Down Expand Up @@ -845,7 +845,7 @@ def test_delete_file_category_not_found(self):
response = self.delete(reverse("osquery_api:file_category", args=[9999]))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No FileCategory matches the given query."
})

def test_delete_file_category(self):
Expand Down Expand Up @@ -930,7 +930,7 @@ def test_get_configuration_not_found(self):
response = self.get(reverse("osquery_api:configuration", args=(9999,)))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No Configuration matches the given query."
})

def test_get_configuration(self):
Expand Down Expand Up @@ -1084,7 +1084,7 @@ def test_update_configuration_not_found(self):
response = self.put_json_data(reverse('osquery_api:configuration', args=(9999,)), {})
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No Configuration matches the given query."
})

def test_update_configuration_atc_not_found(self):
Expand Down Expand Up @@ -1228,7 +1228,7 @@ def test_delete_configuration_not_found(self):
response = self.delete(reverse('osquery_api:configuration', args=(9999,)))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No Configuration matches the given query."
})

def test_delete_configuration_cannot_delete(self):
Expand Down Expand Up @@ -1699,7 +1699,7 @@ def test_get_pack_not_found(self):
response = self.get(reverse("osquery_api:pack", args=(9999,)))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No Pack matches the given query."
})

def test_get_pack(self):
Expand Down Expand Up @@ -1734,7 +1734,7 @@ def test_update_pack_not_found(self):
response = self.put_json_data(reverse("osquery_api:pack", args=(9999,)), {})
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No Pack matches the given query."
})

def test_update_pack_slug_conflict(self):
Expand Down Expand Up @@ -3311,7 +3311,7 @@ def test_get_configuration_pack_not_found(self):
response = self.get(reverse("osquery_api:configuration_pack", args=(9999,)))
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No ConfigurationPack matches the given query."
})

def test_get_configuration_pack(self):
Expand Down Expand Up @@ -3341,7 +3341,7 @@ def test_update_configuration_pack_not_found(self):
response = self.put_json_data(reverse("osquery_api:configuration_pack", args=(9999,)), {})
self.assertEqual(response.status_code, 404)
self.assertEqual(response.json(), {
"detail": "Not found."
"detail": "No ConfigurationPack matches the given query."
})

def test_update_configuration_pack_configuration_fields_empty(self):
Expand Down
2 changes: 1 addition & 1 deletion tests/santa/test_api_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ def test_rule_delete_not_found(self):
self.set_permissions("santa.delete_rule")
response = self.delete(reverse("santa_api:rule", args=(123456789,)))
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
self.assertEqual(response.json(), {'detail': 'Not found.'})
self.assertEqual(response.json(), {'detail': 'No Rule matches the given query.'})

def test_rule_delete_unauthorized(self):
configuration = self.force_configuration()
Expand Down

0 comments on commit 40b1a21

Please sign in to comment.