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.

Sign up for GitHub

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

Jump to bottom

Merge dev -> main #650

Merged
merged 16 commits into from
Jun 25, 2024
Merged

Merge dev -> main #650

merged 16 commits into from
Jun 25, 2024

Conversation

t-aleksander
Copy link
Contributor

@t-aleksander t-aleksander commented Jun 24, 2024 •
edited
Loading

📖 Description

Merges current dev branch into main.

🛠️ Dev Branch Merge Checklist:

Documentation

  • If testing requires changes in the environment or deployment, please update the documentation (https://defguard.gitbook.io) first and attach the link to the documentation section in this pool request
  • I have commented on my code, particularly in hard-to-understand areas

Testing

  • I have prepared end-to-end tests for all new functionalities
  • I have performed end-to-end tests manually and they work
  • New and existing unit tests pass locally with my changes

Deployment

  • If deployment is affected I have made corresponding/required changes to deployment (Docker, Kubernetes, one-line install)

🏚️ Main Branch Merge Checklist:

Testing

  • I have merged my changes before to dev and the dev checklist is done
  • I have tested all functionalities on the dev instance and they work

Documentation

  • I have made corresponding changes to the user & admin documentation and added new features documentation with screenshots for users/admins

j-chmielewski and others added 14 commits April 24, 2024 08:26
@j-chmielewski
fix: mfa login screen styles (#629)
c0f8a93
@wojcik91
feat: add warning when removing a group (#628)
da89afa 
* add basic confirmation modal for group remove

* bump rust version

* update dependencies

* add list of VPN location names to group info response

* remove deprecated methods

* handle vpn locations in group edit requests

* fix edit group modal

* fill in delete modal content

* update query data

* test group info in API response

* add more helper commands

* leave LDAP todos

---------

Co-authored-by: Maciej Wójcik <wojcik91@gmail.com>
@wojcik91
fix: sync WireGuard locations allowed devices after removing user gro…
bed66c5 
…up (#630)

* add basic confirmation modal for group remove

* bump rust version

* update dependencies

* add list of VPN location names to group info response

* remove deprecated methods

* handle vpn locations in group edit requests

* fix edit group modal

* fill in delete modal content

* update query data

* test group info in API response

* add more helper commands

* leave LDAP todos

* add failing test for group removal

* add comment

* add missing DB transaction commit

---------

Co-authored-by: Maciej Wójcik <wojcik91@gmail.com>
ci: update legacy GH actions
976b59a
ci: update kubectl action
234f563
@t-aleksander
fix: make config structure valid if some fields are missing (#637)
f3eb358 
* change config generation

* remove unnecessary type
@t-aleksander
fix: add workaround for wrong config file extension on some browsers (#…
6acd5a7 
…638)

* fix file extension on some browsers

* remove charset as its unsued according to the standard
@t-aleksander
fix: verify mfa status during openid authorization (#641)
c92960e 
* check if user has mfa enabled during openid flow

* add comments
@t-aleksander @j-chmielewski @moubctez
feat: add user disabling (#640)
4dc9ff8 
* add is_active column to the database

* use is_active field to check if the user is active

* add backend logic

* handle user disabling on the frontend

* sqlx prepare

* prevent disabled users from starting the enrollment

* set active by default

* prevent starting desktop configuration for disabled users

* logout disabled users

* Apply suggestions from code review

Co-authored-by: Jacek Chmielewski <jchmielewski@teonite.com>

* remove distinct on

* logout, then change status

* update generated localization

* add warnings

* modify frontend handling of disabled users

* sqlx prepare

* add tests

* prevent from starting password reset on disabled user

* don't display password reset button if the user is disabled

* add ldap todo

* hide user status from himself

* prevent admin from disabling himself

* add more tests

* properly check if the admin is going to disable himself

* fix css

* add new line to migrations

* rephrase

Co-authored-by: Adam <aciarcinski@teonite.com>

* don't panic

* add more log messages

* make tests more reliable

* upddate protobufs

* format

* sqlx prepare

* fix test

---------

Co-authored-by: Jacek Chmielewski <jchmielewski@teonite.com>
Co-authored-by: Adam <aciarcinski@teonite.com>
@t-aleksander
fix: logout all sessions when mfa is enabled (#644)
99b76f7
@t-aleksander @j-chmielewski
Add more logging (#645)
ae9874e 
* add more logs 1

* add more logs 2

* add missing semicolon

* Apply suggestions from code review

Co-authored-by: Jacek Chmielewski <jchmielewski@teonite.com>

---------

Co-authored-by: Jacek Chmielewski <jchmielewski@teonite.com>
@t-aleksander
feat: add new logo (#646)
9ae4a62 
* add new logo

* update pwa icons

* optimize with oxipng

* fix appstore logo
@t-aleksander
ci: Build deb/rpm packages (#649)
6eddd52 
* embed ui into the binary

* make sure all required files are embedded

* make the packaging actually work

* add newlines

* prepare workflow file for testing

* add packaging step for .deb

* defguard-core -> defguard

* place the binary in /usr/bin

* try without path interpolation

* try without cross compilation

* try with env passthrough

* env -> conf

* add frontend building step

* set node version

* add cache dependency path

* remove node version from matrix

* fix path

* frozen lockfile

* build rpm

* cleanup and fix docker

* fix .env file

* remove possibly unnecessary step

* cleanup

* cleanup 2

* sort cargo toml

* add new lines

* change dockerfile

* sort whole file

* remove unused file
@t-aleksander
fix: fix frontend linter errors (#651)
a74f157
@t-aleksander t-aleksander changed the title Merge Dev Merge dev -> main Jun 25, 2024
@t-aleksander
chore: bump version 0.10.0 -> 0.11.0 (#652)
e9bf589 
* bump version

* update lockfile
@t-aleksander t-aleksander marked this pull request as ready for review June 25, 2024 12:52
@t-aleksander t-aleksander merged commit f5f1056 into main Jun 25, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@t-aleksander @teon @j-chmielewski @wojcik91