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.

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

fix: url #118

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api_app/queryset.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ def _alias_for_test(self):
test_value=Case(
When(
name__icontains="url",
then=Value("https://threatmatrix.com", output_field=JSONField()),
then=Value("https://khulnasoft.com", output_field=JSONField()),
),
When(
name="pdns_credentials",
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Stage 1: Frontend
# Remove this part if it is conflicting with the frontend you are currently testing
FROM node:lts-alpine3.18 as frontend-build
FROM node:lts-alpine3.18 AS frontend-build

WORKDIR /
# copy react source code
Expand All @@ -13,7 +13,7 @@ RUN npm install npm@latest --location=global \
&& PUBLIC_URL=/static/reactapp/ npm run build

# Stage 2: Backend
FROM python:3.11.7 as backend-build
FROM python:3.11.7 AS backend-build

ENV PYTHONUNBUFFERED 1
ENV DJANGO_SETTINGS_MODULE threat_matrix.settings
Expand Down
2 changes: 1 addition & 1 deletion requirements/project-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ lief==0.15.1
maxminddb==2.6.0
geoip2==4.8.0
mwdblib==4.5.0
git+https://github.com/decalage2/oletools.git@ccf99d1a8f85e552f5cc130fbaa504cfe5725a92
git+https://github.com/decalage2/oletools.git@b565533d6757f3dde2501e946ed6977ebbf2830a
OTXv2==1.5.12
peepdf-fork==0.4.3
pdfid==1.1.0
Expand Down
8 changes: 4 additions & 4 deletions tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ def setUpTestData(cls):
cls.guest = User.objects.get(is_superuser=False, username="guest")
except User.DoesNotExist:
cls.guest = User.objects.create(
username="guest", email="guest@threatmatrix.com", password="test"
username="guest", email="guest@khulnasoft.com", password="test"
)

try:
cls.user = User.objects.get(is_superuser=False, username="user")
except User.DoesNotExist:
cls.user = User.objects.create(
username="user", email="user@threatmatrix.com", password="test"
username="user", email="user@khulnasoft.com", password="test"
)

try:
cls.admin = User.objects.get(is_superuser=False, username="admin")
except User.DoesNotExist:
cls.admin = User.objects.create(
username="admin", email="admin@threatmatrix.com", password="test"
username="admin", email="admin@khulnasoft.com", password="test"
)

try:
Expand All @@ -57,7 +57,7 @@ def setUpTestData(cls):
except User.DoesNotExist:
cls.superuser = User.objects.create_superuser(
username="superuser@threatmatrix.org",
email="test@threatmatrix.com",
email="test@khulnasoft.com",
password="test",
)

Expand Down
2 changes: 1 addition & 1 deletion tests/api_app/analyzers_manager/test_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def _create_jobs(self):
)
Job.objects.create(
user=self.superuser,
observable_name="test@threatmatrix.com",
observable_name="test@khulnasoft.com",
observable_classification="generic",
status="reported_without_fails",
)
Expand Down
2 changes: 1 addition & 1 deletion tests/api_app/connectors_manager/test_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def run(self) -> dict:
with self.assertRaises(NotImplementedError):
MockUpConnector(cc).health_check(self.user)
pc = PluginConfig.objects.create(
value="https://threatmatrix.com",
value="https://khulnasoft.com",
owner=self.user,
parameter=Parameter.objects.get(name="url_key_name", python_module=pm),
connector_config=cc,
Expand Down
4 changes: 2 additions & 2 deletions tests/api_app/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_to_representation(self):
type="str",
).first()
pc = PluginConfig.objects.create(
value="https://threatmatrix.com",
value="https://khulnasoft.com",
owner=self.user,
parameter=param,
analyzer_config=AnalyzerConfig.objects.filter(
Expand All @@ -77,7 +77,7 @@ def test_to_representation(self):
self.assertEqual(org.name, data["organization"])
pc.delete()
pc = PluginConfig.objects.create(
value="https://threatmatrix.com",
value="https://khulnasoft.com",
owner=self.user,
parameter=param,
analyzer_config=AnalyzerConfig.objects.filter(
Expand Down
4 changes: 2 additions & 2 deletions tests/api_app/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def test_get(self):
# they should not find anything
self.standard_user = User.objects.create_user(
username="standard_user",
email="standard_user@threatmatrix.com",
email="standard_user@khulnasoft.com",
password="test",
)
self.standard_user.save()
Expand Down Expand Up @@ -178,7 +178,7 @@ def test_list(self):
org1 = Organization.objects.create(name="testorg1")
another_owner = User.objects.create_user(
username="another_owner",
email="another_owner@threatmatrix.com",
email="another_owner@khulnasoft.com",
password="test",
)
another_owner.save()
Expand Down
Loading