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

WIP - Upgrade core #220

Closed
wants to merge 233 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
233 commits
Select commit Hold shift + click to select a range
6113814
addition of Czech language vatiables and files to code
multiflexi Jan 9, 2024
2bf81e9
fix inconsistency for English
multiflexi Jan 9, 2024
92ee614
use newer version of vue-i18n
multiflexi Jan 9, 2024
b48e35f
improve language settings and selection
multiflexi Jan 9, 2024
c1d42af
English inconsistencies
multiflexi Feb 5, 2024
003c9a4
Czech translation
multiflexi Feb 5, 2024
fc20dfb
use secrets for Docker, remove Docker .env from repository
multiflexi Feb 20, 2024
577122e
fix of leftover
multiflexi Feb 20, 2024
f575da9
upgrade core to use current Alpine and Python
multiflexi Mar 3, 2024
23272be
upgrade requirements.txt, remove unnecessary items
multiflexi Mar 3, 2024
7ae6548
update code for newer version of flask_jwt_extended, f-strings
multiflexi Mar 3, 2024
2e607d4
remove flask_script, use click
multiflexi Mar 3, 2024
68eb7ed
remove flask_script
multiflexi Mar 3, 2024
9ae1928
JWT fixes
multiflexi Mar 5, 2024
79ed0a2
add git to build dependencies in dockerfile
multiflexi Mar 5, 2024
200475e
update requirements
multiflexi Mar 5, 2024
82b09b9
Merge branch 'CZZ' into CZ
multiflexi Mar 7, 2024
476f6f0
Fix error: Multiple head revisions are present for given argument 'he…
Mar 7, 2024
353fe64
Merge pull request #223 from Progress1/upgrade_db
Progress1 Mar 7, 2024
6e18e78
Fix upgrade db error 2 (caused previous PR)
Mar 8, 2024
ea4a932
Merge pull request #224 from Progress1/update_fix
Progress1 Mar 8, 2024
cc2e82a
language priority and fallback
multiflexi Mar 9, 2024
0172fa4
default passwords in .env.example
multiflexi Mar 11, 2024
267466c
moved secrets to separate directory
multiflexi Mar 11, 2024
fd5b225
ignore .txt files in docker/secrets
multiflexi Mar 11, 2024
cf0af1b
update docker compose files
multiflexi Mar 11, 2024
57eb242
implement secrets to keycloak
multiflexi Mar 11, 2024
b94ca54
update documentation
multiflexi Mar 11, 2024
8e33a63
Create dependabot.yml
multiflexi Mar 11, 2024
e6649dc
Update dependabot.yml
multiflexi Mar 11, 2024
2febec0
Update dependabot.yml
multiflexi Mar 11, 2024
ec020f4
Update dependabot.yml
multiflexi Mar 11, 2024
02f83b0
Merge pull request #6 from multiflexi/multiflexi-patch-1
multiflexi Mar 11, 2024
61353d8
Update dependabot.yml
multiflexi Mar 11, 2024
91b23a7
prefer ENG
multiflexi Mar 12, 2024
a609e16
Merge pull request #222 from multiflexi/CZ
Progress1 Mar 12, 2024
fd9ab72
Merge pull request #226 from multiflexi/main
Progress1 Mar 12, 2024
312d1fb
Bump python-dateutil from 2.8.2 to 2.9.0.post0 in /src/collectors
dependabot[bot] Mar 12, 2024
76cc500
Bump marshmallow from 3.21.0 to 3.21.1 in /src/collectors
dependabot[bot] Mar 12, 2024
62cf8c1
Bump marshmallow from 3.21.0 to 3.21.1 in /src/bots
dependabot[bot] Mar 12, 2024
2fb7dd7
Bump marshmallow from 3.21.0 to 3.21.1 in /src/publishers
dependabot[bot] Mar 12, 2024
c7662d3
Bump pymisp from 2.4.186 to 2.4.187 in /src/publishers
dependabot[bot] Mar 12, 2024
dfb3f5f
Bump weasyprint from 61.1 to 61.2 in /src/presenters
dependabot[bot] Mar 12, 2024
d4f7516
Bump marshmallow from 3.21.0 to 3.21.1 in /src/presenters
dependabot[bot] Mar 12, 2024
e1fdca8
Bump vue-cookies from 1.7.4 to 1.8.3 in /src/gui
dependabot[bot] Mar 12, 2024
70845b4
Bump vue-i18n from 8.26.7 to 8.28.2 in /src/gui
dependabot[bot] Mar 12, 2024
6df49b4
rename example to sample, update doc
multiflexi Mar 12, 2024
ba3c581
fixes
multiflexi Mar 12, 2024
e8929cc
Update dependabot.yml
multiflexi Mar 14, 2024
c5e885c
Added ConfirmDelete component for confirming deletion of item + trans…
Ximelele Mar 15, 2024
77ff9ae
Added delete confirmation to assess section and single item detail
Ximelele Mar 15, 2024
0fc02b2
Added delete window to grouping section
Ximelele Mar 15, 2024
d18ec8a
Revert "Added delete window to grouping section"
Ximelele Mar 15, 2024
640362a
fix product preview for message
multiflexi Mar 16, 2024
596d333
Replacing hex color values with vuetify color palette names
Ximelele Mar 18, 2024
1cb8915
Merge pull request #242 from multiflexi/main
Progress1 Mar 18, 2024
5057376
Merge pull request #241 from SK-CERT/dependabot/npm_and_yarn/src/gui/…
Progress1 Mar 18, 2024
3d92f97
Merge pull request #239 from SK-CERT/dependabot/npm_and_yarn/src/gui/…
Progress1 Mar 18, 2024
965cfb5
Merge pull request #235 from SK-CERT/dependabot/pip/src/presenters/ma…
Progress1 Mar 18, 2024
2f5a156
Merge pull request #234 from SK-CERT/dependabot/pip/src/presenters/we…
Progress1 Mar 18, 2024
aec47db
Merge pull request #231 from SK-CERT/dependabot/pip/src/publishers/py…
Progress1 Mar 18, 2024
dd3d07e
Merge pull request #230 from SK-CERT/dependabot/pip/src/publishers/ma…
Progress1 Mar 18, 2024
02c3ea6
Merge pull request #229 from SK-CERT/dependabot/pip/src/bots/marshmal…
Progress1 Mar 18, 2024
245db5a
Merge pull request #227 from SK-CERT/dependabot/pip/src/collectors/py…
Progress1 Mar 18, 2024
82e00a6
Merge pull request #228 from SK-CERT/dependabot/pip/src/collectors/ma…
Progress1 Mar 18, 2024
2340070
Merge pull request #244 from multiflexi/message_product_show
Progress1 Mar 18, 2024
62af7b7
Added delete confirm button to analyze page including in item confirm…
Ximelele Mar 18, 2024
797dd6b
Added delete confirm button to publish page
Ximelele Mar 18, 2024
4d9b592
Added delete confirm button to my assets page
Ximelele Mar 18, 2024
7bc3293
Added title to delete card to remind what item is being deleted
Ximelele Mar 21, 2024
265555f
Added title to delete card to remind what item is being deleted
Ximelele Mar 21, 2024
85acd3a
Aligned text of title to center if text is too short
Ximelele Mar 21, 2024
12f7e1e
Added confirm delete popUp
Ximelele Mar 21, 2024
9fde2c1
Added confirm delete popUp to groups
Ximelele Mar 21, 2024
ec25da3
Added confirm delete popUp to aggregated detail
Ximelele Mar 21, 2024
650c2a7
Fix non working ACL for Product Types
Mar 22, 2024
35ec27f
Merge pull request #249 from Progress1/acl_fix
Progress1 Mar 22, 2024
36fb820
Fix errors:
Mar 26, 2024
4e9f3fc
Merge pull request #252 from Progress1/t_is_null
Progress1 Mar 26, 2024
389f01b
improve presenter
multiflexi Apr 4, 2024
395989f
fix
multiflexi Apr 4, 2024
eda5277
Added confirmation for removing item from analyze report item
Ximelele Apr 11, 2024
d8a3a0f
Merge pull request #243 from Ximelele/feature/confirm1
milankowww Apr 11, 2024
864679c
Merge pull request #255 from multiflexi/improve_presenter_stability
milankowww Apr 11, 2024
04e6024
Fix find_elements_by for XPATH, NAME & CLASS types
Apr 19, 2024
0b8a9b3
Merge pull request #263 from Progress1/selector_fix
Progress1 Apr 19, 2024
f2753cc
Bump pymisp from 2.4.187 to 2.4.190 in /src/publishers
dependabot[bot] Apr 22, 2024
a7747f1
rename sample back to example
multiflexi Apr 22, 2024
766d4a3
prioritize secrets over environment variable
multiflexi Apr 22, 2024
96eb52e
Add confirmation to publish product button
Apr 23, 2024
e3e7710
just indent formating
Apr 23, 2024
6d9874b
Merge pull request #270 from Progress1/publish_confirmation
Progress1 Apr 23, 2024
d123e4b
- replaced ConfirmDelete component to universal MessageBox, no other …
Apr 24, 2024
85c381d
Merge pull request #271 from Progress1/ask_del
Progress1 Apr 24, 2024
b96417c
Bump selenium from 4.18.1 to 4.20.0 in /src/collectors
dependabot[bot] Apr 29, 2024
aba9f88
language update (remove not used)
May 3, 2024
3caf617
Merge pull request #274 from Progress1/lng_update
Progress1 May 3, 2024
bb4b175
Bump jinja2 from 3.1.3 to 3.1.4 in /src/presenters
dependabot[bot] May 6, 2024
7facf86
Bump flask-cors from 4.0.0 to 4.0.1 in /src/presenters
dependabot[bot] May 6, 2024
6e3d459
Bump weasyprint from 61.2 to 62.1 in /src/presenters
dependabot[bot] May 6, 2024
0e68ed4
Bump flask-cors from 4.0.0 to 4.0.1 in /src/bots
dependabot[bot] May 6, 2024
750f5ee
Bump marshmallow from 3.21.1 to 3.21.2 in /src/bots
dependabot[bot] May 6, 2024
33af264
Bump marshmallow from 3.21.1 to 3.21.2 in /src/collectors
dependabot[bot] May 6, 2024
98690f3
Bump flask-cors from 4.0.0 to 4.0.1 in /src/collectors
dependabot[bot] May 6, 2024
dd49a37
Bump marshmallow from 3.21.1 to 3.21.2 in /src/publishers
dependabot[bot] May 6, 2024
3eb9b00
Merge pull request #283 from SK-CERT/dependabot/pip/src/publishers/ma…
Progress1 May 7, 2024
9a2308b
Merge pull request #280 from SK-CERT/dependabot/pip/src/collectors/ma…
Progress1 May 7, 2024
de18e46
Merge pull request #279 from SK-CERT/dependabot/pip/src/bots/marshmal…
Progress1 May 7, 2024
fb0bcd0
Bump flask-cors from 4.0.0 to 4.0.1 in /src/publishers
dependabot[bot] May 7, 2024
439b1ae
Merge pull request #278 from SK-CERT/dependabot/pip/src/bots/flask-co…
Progress1 May 7, 2024
b5daebe
Merge pull request #281 from SK-CERT/dependabot/pip/src/collectors/fl…
Progress1 May 7, 2024
0ed3e9e
Merge pull request #282 from SK-CERT/dependabot/pip/src/publishers/fl…
Progress1 May 7, 2024
d63cf34
Bump gunicorn from 21.2.0 to 22.0.0 in /src/publishers
dependabot[bot] May 7, 2024
1bb3f53
Merge pull request #277 from SK-CERT/dependabot/pip/src/presenters/we…
Progress1 May 7, 2024
aaab315
Bump gunicorn from 21.2.0 to 22.0.0 in /src/bots
dependabot[bot] May 7, 2024
814e573
Merge pull request #276 from SK-CERT/dependabot/pip/src/presenters/fl…
Progress1 May 7, 2024
d2c4009
Merge pull request #275 from SK-CERT/dependabot/pip/src/presenters/ji…
Progress1 May 7, 2024
4cbbe7c
Bump gunicorn from 21.2.0 to 22.0.0 in /src/presenters
dependabot[bot] May 7, 2024
6633e4f
Merge pull request #272 from SK-CERT/dependabot/pip/src/collectors/se…
Progress1 May 7, 2024
fcac4f3
Merge pull request #264 from SK-CERT/dependabot/pip/src/bots/gunicorn…
Progress1 May 7, 2024
840b844
Merge pull request #265 from SK-CERT/dependabot/pip/src/presenters/gu…
Progress1 May 7, 2024
17842f8
Merge pull request #267 from SK-CERT/dependabot/pip/src/publishers/gu…
Progress1 May 7, 2024
c550d91
Bump flask from 3.0.2 to 3.0.3 in /src/collectors
dependabot[bot] May 7, 2024
10c3959
Bump gunicorn from 21.2.0 to 22.0.0 in /src/collectors
dependabot[bot] May 7, 2024
c860d6d
Bump flask from 3.0.2 to 3.0.3 in /src/bots
dependabot[bot] May 7, 2024
3471106
Bump flask from 3.0.2 to 3.0.3 in /src/publishers
dependabot[bot] May 7, 2024
ae35653
Merge pull request #259 from SK-CERT/dependabot/pip/src/collectors/fl…
Progress1 May 7, 2024
cbeccff
Merge pull request #258 from SK-CERT/dependabot/pip/src/bots/flask-3.0.3
Progress1 May 7, 2024
3d84e4e
Merge pull request #268 from SK-CERT/dependabot/pip/src/collectors/gu…
Progress1 May 7, 2024
eb84a22
Bump flask from 3.0.2 to 3.0.3 in /src/presenters
dependabot[bot] May 7, 2024
53907ba
Merge pull request #257 from SK-CERT/dependabot/pip/src/publishers/fl…
Progress1 May 7, 2024
a04f7e9
Merge pull request #260 from SK-CERT/dependabot/pip/src/presenters/fl…
Progress1 May 7, 2024
8a0d9e5
Merge pull request #266 from SK-CERT/dependabot/pip/src/publishers/py…
Progress1 May 7, 2024
a135f13
Bump marshmallow from 3.21.1 to 3.21.2 in /src/presenters
dependabot[bot] May 13, 2024
da6c41e
Add cascade delete to NEWS_ITEM releated tables
May 14, 2024
3bcab5e
comment update
May 15, 2024
ee98f55
Merge pull request #286 from Progress1/news_item
Progress1 May 15, 2024
d42f6f6
Removing dependency of flask-sse (#284)
Ximelele May 15, 2024
4da73ad
Fix error: '': No such file or directory" when running prestart.sh in…
May 16, 2024
5b3de24
Merge pull request #287 from Progress1/prestart_core
Progress1 May 16, 2024
475a84d
resolving conflicts before merge (test 1 :)
May 20, 2024
b9ca0f4
Bump requests from 2.31.0 to 2.32.0 in /src/bots
dependabot[bot] May 20, 2024
7fc93d6
Bump selenium from 4.20.0 to 4.21.0 in /src/collectors
dependabot[bot] May 20, 2024
39646b6
Merge branch 'main' into use_secrets
multiflexi May 21, 2024
9a09fdf
Merge pull request #211 from multiflexi/use_secrets
Progress1 May 21, 2024
065183e
Keycloak update:
May 23, 2024
47f08b7
Merge pull request #293 from Progress1/keycloak_secrets
Progress1 May 24, 2024
75a2304
Merge pull request #285 from SK-CERT/dependabot/pip/src/presenters/ma…
Progress1 May 27, 2024
3cd1016
Merge pull request #289 from SK-CERT/dependabot/pip/src/collectors/se…
Progress1 May 27, 2024
e538049
Bump requests from 2.31.0 to 2.32.2 in /src/collectors
dependabot[bot] May 27, 2024
f3b23c0
Merge pull request #288 from SK-CERT/dependabot/pip/src/bots/requests…
Progress1 May 27, 2024
743e79f
Merge pull request #294 from SK-CERT/dependabot/pip/src/collectors/re…
Progress1 May 27, 2024
c50ce96
Fix: Display the description in the OSINT source groups grid (it was …
May 27, 2024
9b1f25b
Merge pull request #295 from Progress1/grp_desc
Progress1 May 27, 2024
b1e7288
Noto fonts tidy up:
May 27, 2024
6696540
Merge pull request #296 from Progress1/font_noto
Progress1 May 27, 2024
fe57b55
Bump requests from 2.32.0 to 2.32.2 in /src/bots
dependabot[bot] May 27, 2024
d2058bf
Bump schedule from 1.2.1 to 1.2.2 in /src/collectors
dependabot[bot] May 27, 2024
27adf2c
Bump requests from 2.31.0 to 2.32.2 in /src/publishers
dependabot[bot] May 27, 2024
6286869
Merge pull request #301 from SK-CERT/dependabot/pip/src/publishers/re…
Progress1 May 29, 2024
931a8e4
Merge pull request #298 from SK-CERT/dependabot/pip/src/bots/requests…
Progress1 May 29, 2024
f711e40
Merge pull request #300 from SK-CERT/dependabot/pip/src/collectors/sc…
Progress1 May 29, 2024
4a55f2d
Bump schedule from 1.2.1 to 1.2.2 in /src/bots
dependabot[bot] May 29, 2024
8c523ff
Merge pull request #299 from SK-CERT/dependabot/pip/src/bots/schedule…
Progress1 May 29, 2024
c9c4a01
Bump requests from 2.32.2 to 2.32.3 in /src/bots
dependabot[bot] Jun 3, 2024
34e5a53
Bump requests from 2.32.2 to 2.32.3 in /src/collectors
dependabot[bot] Jun 3, 2024
e558ec6
Bump weasyprint from 62.1 to 62.2 in /src/presenters
dependabot[bot] Jun 10, 2024
f167f4d
Bump marshmallow from 3.21.2 to 3.21.3 in /src/publishers
dependabot[bot] Jun 10, 2024
6699926
Bump urllib3 from 2.2.1 to 2.2.2 in /src/publishers
dependabot[bot] Jun 17, 2024
5b46a5d
DTB migrations
multiflexi Jun 20, 2024
fec7715
frontend modifications
multiflexi Jun 20, 2024
1ecc477
modified model and schema
multiflexi Jun 20, 2024
16ebe73
modified model and schema
multiflexi Jun 20, 2024
3f5b8d5
Merge branch 'attr_desc' of https://github.com/multiflexi/Taranis-NG …
multiflexi Jun 20, 2024
beedecb
update presenter
multiflexi Jun 20, 2024
288d523
Added "Last attempt" and "Last collected" date columns in OSINT sour…
Jun 25, 2024
e8b3d59
Merge pull request #302 from SK-CERT/dependabot/pip/src/bots/requests…
Progress1 Jun 25, 2024
2162db8
Merge pull request #309 from SK-CERT/dependabot/pip/src/publishers/ma…
Progress1 Jun 25, 2024
c4a8c8f
Merge pull request #311 from SK-CERT/dependabot/pip/src/publishers/ur…
Progress1 Jun 25, 2024
a5418b3
Bump requests from 2.32.2 to 2.32.3 in /src/publishers
dependabot[bot] Jun 25, 2024
5acae5e
Bump marshmallow from 3.21.2 to 3.21.3 in /src/bots
dependabot[bot] Jun 25, 2024
e83d91c
Merge pull request #305 from SK-CERT/dependabot/pip/src/presenters/we…
Progress1 Jun 25, 2024
590aa2a
Merge pull request #303 from SK-CERT/dependabot/pip/src/collectors/re…
Progress1 Jun 25, 2024
13fd4c4
Bump marshmallow from 3.21.2 to 3.21.3 in /src/presenters
dependabot[bot] Jun 25, 2024
910517f
Merge pull request #304 from SK-CERT/dependabot/pip/src/publishers/re…
Progress1 Jun 25, 2024
f164202
Bump selenium from 4.21.0 to 4.22.0 in /src/collectors
dependabot[bot] Jun 25, 2024
d0f0d2a
Merge pull request #308 from SK-CERT/dependabot/pip/src/bots/marshmal…
Progress1 Jun 25, 2024
c2e902f
Bump marshmallow from 3.21.2 to 3.21.3 in /src/collectors
dependabot[bot] Jun 25, 2024
2c1d020
Bump pymisp from 2.4.190 to 2.4.193 in /src/publishers
dependabot[bot] Jun 25, 2024
db3f20c
Merge pull request #307 from SK-CERT/dependabot/pip/src/collectors/ma…
Progress1 Jun 25, 2024
49ce3c8
Merge pull request #306 from SK-CERT/dependabot/pip/src/presenters/ma…
Progress1 Jun 25, 2024
fd88aa5
Merge pull request #310 from SK-CERT/dependabot/pip/src/publishers/py…
Progress1 Jun 25, 2024
94e4a70
Bump weasyprint from 62.1 to 62.3 in /src/presenters
dependabot[bot] Jun 25, 2024
c96783e
Merge pull request #313 from SK-CERT/dependabot/pip/src/presenters/we…
Progress1 Jun 26, 2024
bdfd098
Merge pull request #315 from SK-CERT/dependabot/pip/src/collectors/se…
Progress1 Jun 26, 2024
99957d1
Merge pull request #312 from multiflexi/attr_desc
Progress1 Jun 26, 2024
a38013d
Merge pull request #316 from Progress1/last_collect
Progress1 Jun 26, 2024
6ec1537
Update linting.yaml with Python 3.12
multiflexi Jun 26, 2024
6917d82
Merge pull request #317 from multiflexi/patch-1
Progress1 Jun 27, 2024
0208560
Update/rewrite slackclient to 2.9.4
Jun 27, 2024
252c590
Merge pull request #318 from Progress1/slack
Progress1 Jun 27, 2024
e40ceb7
Correct wrong formatting: %H:%M:%s -> %H:%M:%S
Jun 28, 2024
86b67c5
Merge pull request #319 from Progress1/time_bug
Progress1 Jun 28, 2024
abb12e6
Bump envelope from 2.0.3 to 2.0.5 in /src/publishers
dependabot[bot] Jul 22, 2024
fe6f247
Bump selenium from 4.22.0 to 4.23.0 in /src/collectors
dependabot[bot] Jul 22, 2024
6a44a11
Run collector always in new class. If scheduler or source save action…
Jul 23, 2024
1bd20ab
Folder for templates
multiflexi Jul 24, 2024
b778b58
ignoring yml files in traefik/dynamic
multiflexi Jul 24, 2024
1180bed
Merge pull request #321 from SK-CERT/dependabot/pip/src/collectors/se…
Progress1 Jul 25, 2024
c45b773
Merge pull request #320 from SK-CERT/dependabot/pip/src/publishers/en…
Progress1 Jul 25, 2024
29b3d39
fix error when adding CWE
multiflexi Jul 25, 2024
e8faa0b
fix adding attribute for attachments
multiflexi Jul 25, 2024
e6e0752
Merge pull request #324 from multiflexi/fix_value_description
Progress1 Jul 25, 2024
3141022
Fix missing value_description definition
multiflexi Jul 25, 2024
62e253e
Merge pull request #325 from multiflexi/fix_missing_vd_gui
Progress1 Jul 25, 2024
abe01e5
Merge pull request #323 from multiflexi/custom_templates
Progress1 Jul 25, 2024
d3406a0
Merge pull request #322 from Progress1/col_fix
Progress1 Jul 26, 2024
24c4845
fix LDAP env variables
multiflexi Jul 26, 2024
9674228
update value desc only if found
multiflexi Jul 26, 2024
461050b
Merge pull request #327 from multiflexi/another_value_desc_fix
Progress1 Jul 26, 2024
4e2918f
Merge pull request #326 from multiflexi/missing_env_vars
Progress1 Jul 26, 2024
6217739
check if ldap authentication is used
multiflexi Jul 29, 2024
04c4be9
use __init__
multiflexi Jul 29, 2024
9061fa4
Merge pull request #328 from multiflexi/ldap_improvement
Progress1 Jul 29, 2024
dd6f547
upgrade core to use current Alpine and Python
multiflexi Mar 3, 2024
0d1ef99
upgrade requirements.txt, remove unnecessary items
multiflexi Mar 3, 2024
e875305
update code for newer version of flask_jwt_extended, f-strings
multiflexi Mar 3, 2024
7d904ec
remove flask_script, use click
multiflexi Mar 3, 2024
61e60e2
remove flask_script
multiflexi Mar 3, 2024
7aac3f1
JWT fixes
multiflexi Mar 5, 2024
c9359a7
add git to build dependencies in dockerfile
multiflexi Mar 5, 2024
a55fe50
update requirements
multiflexi Mar 5, 2024
dc4c928
Merge branch 'upgrade_core' of https://github.com/multiflexi/Taranis-…
multiflexi Jul 30, 2024
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
37 changes: 37 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "docker"
directory: "/docker"
schedule:
interval: "weekly"
- package-ecosystem: "pip"
directory: "/src/bots"
schedule:
interval: "weekly"
- package-ecosystem: "pip"
directory: "/src/collectors"
schedule:
interval: "weekly"
ignore:
- dependency-name: "slackclient"
# - package-ecosystem: "pip"
# directory: "/src/core"
# schedule:
# interval: "weekly"
- package-ecosystem: "pip"
directory: "/src/presenters"
schedule:
interval: "weekly"
- package-ecosystem: "pip"
directory: "/src/publishers"
schedule:
interval: "weekly"
- package-ecosystem: "npm"
directory: "/src/gui"
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/linting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.10']
python-version: ['3.8', '3.10', '3.12']
steps:
- uses: actions/checkout@v2
- name: lint with black
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ build/
*.bak

# sensitive data not to be commited
docker/.env
docker/secrets/*.txt
docker/traefik/dynamic/*.yml
.env.local
.env.*.local
src/.env
Expand All @@ -45,3 +48,7 @@ local/
*.njsproj.user
*.sln
*.sw?

# ignore custom templates
src/presenters/templates/custom/*
!src/presenters/templates/custom/README.md
7 changes: 4 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

repos:
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 24.4.0
hooks:
- id: black
language_version: python3
args: [--line-length=142]

- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
rev: 7.0.0
hooks:
- id: flake8
additional_dependencies: [flake8-docstrings]
Expand All @@ -17,8 +17,9 @@ repos:
exclude: ^src/core/migrations/versions

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
exclude: '.*\.example$'
- id: trailing-whitespace
23 changes: 17 additions & 6 deletions docker/.env → docker/.env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# General
COMPOSE_PROJECT_NAME=taranis-ng
TARANIS_NG_AUTHENTICATOR=password
HTTP_PROXY=
HTTPS_PROXY=

Expand All @@ -12,11 +11,14 @@ TARANIS_NG_TAG=v23.12.1
# Timezone for all containers
TZ=Europe/Bratislava

# Default passwords. CHANGE THESE FOR PRODUCTION!
POSTGRES_PASSWORD=supersecret
POSTGRES_KEYCLOAK_PASSWORD=supersecret
JWT_SECRET_KEY=supersecret
COLLECTOR_PRESENTER_PUBLISHER_API_KEY=supersecret
# Force language
VUE_APP_TARANIS_NG_LOCALE=""

# Taranis-NG now supports Docker secrets. Use this in production! More here: https://docs.docker.com/compose/use-secrets/
# These variables bellow are only for testing purposes and cannot be mixed with use of Docker secrets!
# POSTGRES_PASSWORD=supersecret
# JWT_SECRET_KEY=supersecret
# COLLECTOR_PRESENTER_PUBLISHER_API_KEY=supersecret

# Paths
CVE_UPDATE_FILE=/data/cve_dictionary.xml
Expand All @@ -28,6 +30,14 @@ TARANIS_NG_HOSTNAME=localhost
TARANIS_NG_HTTPS_PORT=4443
TARANIS_NG_HTTP_PORT=8080
TARANIS_NG_HTTPS_URI=https://localhost:4443
TARANIS_NG_AUTHENTICATOR=password

# To use LDAP authentication, adjust the following lines to your LDAP server,
# change TARANIS_NG_AUTHENTICATOR to ldap and add CA certificate to "auth/ldap_ca.pem"
# or point LDAP_CA_CERT_PATH to it.
LDAP_SERVER=ldaps://ldap.example.com
LDAP_BASE_DN="ou=people,dc=example,dc=com"

TRAEFIK_MANAGEMENT_PORT=127.0.0.1:8081

# Limits
Expand All @@ -41,3 +51,4 @@ PRESENTER_PORT=5002
KEYCLOAK_VERSION=16.1.1
KEYCLOAK_USER=admin
KEYCLOAK_PASSWORD=supersecret
POSTGRES_KEYCLOAK_PASSWORD=supersecret
21 changes: 19 additions & 2 deletions docker/Dockerfile.core
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
FROM python:3.7-alpine3.14 AS build_shared
FROM python:3.12-alpine3.19 AS build_shared

WORKDIR /build_shared/

RUN pip install --no-cache-dir build
COPY ./src/shared/. .
RUN python -m build

RUN apk add --no-cache \
gcc \
build-base\
libc-dev\
linux-headers

COPY ./src/core/sse/forward.c .

RUN gcc -o forward forward.c


FROM python:3.7-alpine3.14 AS production
FROM python:3.12-alpine3.19 AS production

WORKDIR /app/

Expand Down Expand Up @@ -36,6 +45,11 @@ RUN \
apk add --no-cache --virtual .build-deps \
gcc \
g++ \
build-base\
libc-dev\
zlib-dev \
linux-headers \
git \
make \
glib-dev \
musl-dev \
Expand All @@ -45,6 +59,9 @@ RUN \
pip install --no-cache-dir -r /app/requirements.txt && \
apk --purge del .build-deps


COPY --from=build_shared /build_shared/forward /usr/local/bin/forward

COPY ./docker/start.sh /start.sh
RUN chmod +x /start.sh

Expand Down
17 changes: 16 additions & 1 deletion docker/Dockerfile.presenters
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,22 @@ RUN \
apk add --no-cache \
msttcorefonts-installer \
fontconfig \
font-noto-all \
font-noto \
font-noto-arabic \
font-noto-armenian \
font-noto-bengali \
font-noto-devanagari \
font-noto-ethiopic \
font-noto-extra \
font-noto-georgian \
font-noto-hebrew \
font-noto-kannada \
font-noto-lao \
font-noto-malayalam \
font-noto-myanmar \
font-noto-tamil \
font-noto-thai \
font-noto-tibetan \
terminus-font \
ttf-opensans \
font-bakoma \
Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ git clone https://github.com/SK-CERT/Taranis-NG.git
cd Taranis-NG
```

_Then_, using your favorite text editor, please change the default passwords in `docker/.env` file. You can only skip this step when deploying a non-production testing environment.
_Then_, remove `.example` extension from file `docker/.env.example` and files in `docker/secrets`. Use your favorite text editor and change default passwords. Taranis NG uses [Docker secrets](https://docs.docker.com/compose/use-secrets/) to store sensitive data. (Saving passwords in variables defined in `docker/.env` is not advised and you will need to modify Docker compose YAML files to make it work correctly. Also, make sure you do not have both POSTGRES_PASSWORD and POSTGRES_PASSWORD_FILE set - they are mutually exclusive)

```bash
vim docker/.env
Expand Down Expand Up @@ -151,7 +151,7 @@ Any configuration options are available at [https://hub.docker.com/_/postgres](h
| `DB_POOL_SIZE` | SQLAlchemy QueuePool number of active connections to the database. | `100` |
| `DB_POOL_RECYCLE` | SQLAlchemy QueuePool maximum connection age. | `300` |
| `DB_POOL_TIMEOUT` | SQLAlchemy QueuePool connection timeout. | `5` |
| `JWT_SECRET_KEY` | JWT token secret key. | `J6flTliJ076zWg` |
| `JWT_SECRET_KEY` | JWT token secret key. | `supersecret` |
| `OPENID_LOGOUT_URL` | Keycloak logout URL. | `https://example.com/auth/realms/master/protocol/openid-connect/logout` |
| `WORKERS_PER_CORE` | Number of gunicorn worker threads to spawn per CPU core. | `4` |
| `SKIP_DEFAULT_COLLECTOR` | Set to `true` to prevent initialization of a default docker collector at first run | `` |
Expand Down
3 changes: 1 addition & 2 deletions docker/docker-compose-keycloak-serv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
driver: "json-file"
options:
max-size: "200k"
max-file: "10"
max-file: "10"

keycloak:
image: "skcert/taranis-ng-keycloak:${TARANIS_NG_TAG}"
Expand Down Expand Up @@ -61,4 +61,3 @@ services:
volumes:
keycloak_db_data:
keycloak_data:

27 changes: 18 additions & 9 deletions docker/docker-compose-keycloak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,32 @@ version: "3.9"

services:
core:
environment:
environment:
TARANIS_NG_AUTHENTICATOR: "keycloak"

OPENID_LOGOUT_URL: "${TARANIS_NG_HTTPS_URI}/api/v1/keycloak/auth/realms/taranis-ng/protocol/openid-connect/logout?redirect_uri=GOTO_URL"
TARANIS_NG_KEYCLOAK_INTERNAL_URL: "http://keycloak:8080"
TARANIS_NG_KEYCLOAK_REALM: "taranis-ng"
# CLIENT (external Keycloak)
TARANIS_NG_KEYCLOAK_URL: "https://keycloak.example.com"
TARANIS_NG_KEYCLOAK_INTERNAL_URL: "https://keycloak.int.example.com"
TARANIS_NG_KEYCLOAK_CLIENT_ID: "taranis-ng"
TARANIS_NG_KEYCLOAK_CLIENT_SECRET: "supersecret"
KEYCLOAK_USER_MANAGEMENT: "true"
KEYCLOAK_SERVER_URL: "http://keycloak:8080"
KEYCLOAK_ADMIN_USERNAME: "admin"
KEYCLOAK_ADMIN_PASSWORD: "supersecret"
KEYCLOAK_REALM_NAME: "taranis-ng"
KEYCLOAK_CLIENT_SECRET_KEY: "supersecret"
KEYCLOAK_CLIENT_SECRET_KEY_FILE: /run/secrets/keycloak_client_secret_key
KEYCLOAK_USER_MANAGEMENT: "false"
# needed if KEYCLOAK_USER_MANAGEMENT = true
KEYCLOAK_ADMIN_USERNAME: "admin"
KEYCLOAK_ADMIN_PASSWORD_FILE: /run/secrets/keycloak_admin_password
KEYCLOAK_VERIFY: "true"
secrets:
- keycloak_client_secret_key
- keycloak_admin_password

gui:
environment:
VUE_APP_TARANIS_NG_LOGOUT_URL: "${TARANIS_NG_HTTPS_URI}/api/v1/auth/logout?gotoUrl=TARANIS_GUI_URI"
VUE_APP_TARANIS_NG_LOGIN_URL: "${TARANIS_NG_HTTPS_URI}/api/v1/keycloak/auth/realms/taranis-ng/protocol/openid-connect/auth?response_type=code&client_id=taranis-ng&redirect_uri=TARANIS_GUI_URI"

secrets:
keycloak_client_secret_key:
file: ./secrets/keycloak_client_secret_key.txt
keycloak_admin_password:
file: ./secrets/keycloak_admin_password.txt
Loading
Loading