Skip to content

Commit 0de658a

Browse files
authored
[MRG] Merge pull request #685 from dfir-iris/ruff
Ruff
2 parents 79a16be + 2acf8c5 commit 0de658a

34 files changed

+102
-43
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ jobs:
2727
steps:
2828
- name: Check out iris
2929
uses: actions/checkout@v4
30+
- name: Check code with ruff
31+
uses: astral-sh/ruff-action@v2
32+
with:
33+
args: check --output-format=github
34+
src: ./source
3035
- name: Build dockers
3136
run: |
3237
# TODO using the environment file from tests to build here.

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[tool.ruff.lint]
2+
ignore = ["E402", "E711", "E712", "E721", "E722", "F821", "F841", "F541", "F403", "F401"]
3+

source/app/alembic/versions/4ecdfcb34f7c_add_compromise_status_to_assets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# revision identifiers, used by Alembic.
1212
from app.alembic.alembic_utils import _table_has_column
13-
from app.models import CompromiseStatus
13+
from app.models.models import CompromiseStatus
1414

1515
revision = '4ecdfcb34f7c'
1616
down_revision = 'a929ef458490'

source/app/blueprints/access_controls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
from app.iris_engine.access_control.utils import ac_fast_check_user_has_case_access
4949
from app.iris_engine.access_control.utils import ac_get_effective_permissions_of_user
5050
from app.iris_engine.utils.tracker import track_activity
51-
from app.models import Cases
51+
from app.models.cases import Cases
5252
from app.models.authorization import Permissions
5353
from app.models.authorization import CaseAccessLevel
5454

source/app/blueprints/rest/dim_tasks_routes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
from app.models import CaseAssets
3131
from app.models import CaseReceivedFile
3232
from app.models import CaseTasks
33-
from app.models import Cases
34-
from app.models import CasesEvent
33+
from app.models.cases import Cases
34+
from app.models.cases import CasesEvent
3535
from app.models import GlobalTasks
3636
from app.models import Ioc
3737
from app.models import Notes

source/app/business/auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from app.iris_engine.access_control.ldap_handler import ldap_authenticate
1010
from app.iris_engine.access_control.utils import ac_get_effective_permissions_of_user
1111
from app.iris_engine.utils.tracker import track_activity
12-
from app.models import Cases
12+
from app.models.cases import Cases
1313
from app.schema.marshables import UserSchema
1414

1515
log = app.logger

source/app/datamgmt/activities/activities_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from sqlalchemy import and_
2020
from sqlalchemy import desc
2121

22-
from app.models import Cases
22+
from app.models.cases import Cases
2323
from app.models.authorization import User
2424
from app.models.models import UserActivity
2525

source/app/datamgmt/alerts/alerts_db.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,16 @@
3737
from app.datamgmt.states import update_timeline_state
3838
from app.iris_engine.access_control.utils import ac_current_user_has_permission
3939
from app.iris_engine.utils.common import parse_bf_date_format
40-
from app.models import Cases, EventCategory, Tags, AssetsType, Comments, CaseAssets, alert_assets_association, \
41-
alert_iocs_association, Ioc, Client
40+
from app.models.cases import Cases
41+
from app.models import EventCategory
42+
from app.models import Tags
43+
from app.models import AssetsType
44+
from app.models import Comments
45+
from app.models import CaseAssets
46+
from app.models import alert_assets_association
47+
from app.models import alert_iocs_association
48+
from app.models import Ioc
49+
from app.models import Client
4250
from app.models.alerts import Alert, AlertStatus, AlertCaseAssociation, SimilarAlertsCache, AlertResolutionStatus, \
4351
AlertSimilarity, Severity
4452
from app.models.authorization import Permissions, User

source/app/datamgmt/case/case_assets_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from app.models import AssetsType
3030
from app.models import CaseAssets
3131
from app.models import CaseEventsAssets
32-
from app.models import Cases
32+
from app.models.cases import Cases
3333
from app.models import Comments
3434
from app.models import CompromiseStatus
3535
from app.models import Ioc

source/app/datamgmt/case/case_events_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from app.models import CaseEventCategory
2626
from app.models import CaseEventsAssets
2727
from app.models import CaseEventsIoc
28-
from app.models import CasesEvent
28+
from app.models.cases import CasesEvent
2929
from app.models import Comments
3030
from app.models import EventCategory
3131
from app.models import EventComments

0 commit comments

Comments
 (0)