Andras/BoundlessFlowCampus2K

Fork 0

Added separate database credentials for each stack #1152

Merged

a24julot merged 9 commits from issue-988-db-passwords-week7 into both_teams_week_8

2026-05-28 10:48:14 +00:00

b25marem commented

2026-05-26 06:23:45 +00:00

Collaborator

What has been done

Added separate database usernames and passwords for each stack service
Updated compose files for:
- user
- parking
- temperature
- energy
- roomBooking
Updated healthchecks to use stack-specific database users
Added stack-specific environment variables

Notes

This PR re-applies the changes on top of team_1_week_7 after PR #985 was merged.

Conflicts from the previous closed PR were resolved against the latest week_7 branch.

## What has been done * Added separate database usernames and passwords for each stack service * Updated compose files for: * user * parking * temperature * energy * roomBooking * Updated healthchecks to use stack-specific database users * Added stack-specific environment variables ## Notes This PR re-applies the changes on top of `team_1_week_7` after PR #985 was merged. Conflicts from the previous closed PR were resolved against the latest week_7 branch.

b25marem added the

needs review

label

2026-05-26 06:23:45 +00:00

b25marem added 1 commit

2026-05-26 06:23:45 +00:00

Added separate database credentials for each stack e744073c38

c24danli

2026-05-26 06:31:56 +00:00

removed the
needs review
label
requested review from b23albst

b23albst requested changes

2026-05-26 07:12:03 +00:00

b23albst left a comment

Collaborator

Review on #1152

Whats done

Tested building a fresh install of the project to see if it works

Tested on ubuntu

App does not star starts
- This is because the new database credentials are not generated in the installation script
- Since the services with new credentials still use DATABASE_USER and DATABASE_PASSWORD in their connection strings, some of them do not work, even when the variables have been added to the env file.

Inspected following files

Indentation/code styling ok
Naming convention ok
Comments
- There are no comments, but as this is the case across all yaml files, this is no problem
General code quality
+ On line 71 in DockerCompose/stacks/parking/compose.yaml there is some code left from a merge. This should be removed

What needs to be done

Add new env variables to installation script
Update the database connection strings in the affected services to use new env variables
Fix code on line 71 in DockerCompose/stacks/parking/compose.yaml that is left from merge.
Another thing is that the file database does not get new credentials, however this is fine with me, as long as DATABASE_USER and DATABASE_PASSWORD are not removed from the installation scripts

Conclusion

This is not ready to merge yet

# Review on #1152 ## Whats done Tested building a fresh install of the project to see if it works ### Tested on ubuntu + App does not star starts + This is because the new database credentials are not generated in the installation script + Since the services with new credentials still use DATABASE_USER and DATABASE_PASSWORD in their connection strings, some of them do not work, even when the variables have been added to the env file. ### Inspected following files + Indentation/code styling ok + Naming convention ok + Comments + There are no comments, but as this is the case across all yaml files, this is no problem + General code quality + On line 71 in DockerCompose/stacks/parking/compose.yaml there is some code left from a merge. This should be removed ## What needs to be done + Add new env variables to installation script + Update the database connection strings in the affected services to use new env variables + Fix code on line 71 in DockerCompose/stacks/parking/compose.yaml that is left from merge. + Another thing is that the file database does not get new credentials, however this is fine with me, as long as DATABASE_USER and DATABASE_PASSWORD are not removed from the installation scripts ## Conclusion + This is not ready to merge yet

b23albst added 2 commits

2026-05-26 07:50:53 +00:00

Added new env variable generation to install scripts c7b9a1dc65

Changed env variables for connection strings 0067072134

b23albst commented

2026-05-26 08:01:26 +00:00

Collaborator

This is still not ready to merge. It builds, but cannot connect to the databases. When checking the logs, the it is still DATABASE_USER trying to connect, presumably with the incorrect password. I do not know if this is because it still uses the old images, or if I missed updating some env-variable

b23albst added 1 commit

2026-05-26 08:49:25 +00:00

Revert "Changed env variables for connection strings" abb0420e66

This reverts commit 0067072134.

b23albst commented

2026-05-26 09:25:43 +00:00

Collaborator

When trying to connect to the databases, the "old" variables are still used (strings DATABASE_USER and DATABASE_PASSWORD in env file). I have no idea why.

b23albst commented

2026-05-26 09:36:03 +00:00

Collaborator

I think the problem is in middleware. The connection string used to connect to all databases there is

var connectionString = $"Host={service}-db;Port=5432;Username={dbUser};Password={dbPassword};Database={dataBase}";

dbUser and Password are still the old DATABASE_USER and DATABASE_PASSWORD.
This needs to be updated so that the correct username and password are used when trying to connect to a specific database

I think the problem is in middleware. The connection string used to connect to **all** databases there is ``` var connectionString = $"Host={service}-db;Port=5432;Username={dbUser};Password={dbPassword};Database={dataBase}"; ``` dbUser and Password are still the old DATABASE_USER and DATABASE_PASSWORD. This needs to be updated so that the correct username and password are used when trying to connect to a specific database

a24timsv commented

2026-05-26 10:16:45 +00:00

Collaborator

@b23albst wrote in #1152 (comment):

I think the problem is in middleware. The connection string used to connect to all databases there is
var connectionString = $"Host={service}-db;Port=5432;Username={dbUser};Password={dbPassword};Database={dataBase}";
dbUser and Password are still the old DATABASE_USER and DATABASE_PASSWORD. This needs to be updated so that the correct username and password are used when trying to connect to a specific database

Was just about to comment this. This issue basically covers 4 areas: compose files, installation scripts, middleware and all the service DataQueries.
As you just said, middleware connects to all databases with the same user and password. This needs to be changed so that middleware tries to access ENERGY_DATABASE_USER if the service provided is energy, for example. Middleware right now does receive the service name so this should be possible.

@b23albst wrote in https://git.webug.se/Andras/BoundlessFlowCampus2K/pulls/1152#issuecomment-14111: > I think the problem is in middleware. The connection string used to connect to **all** databases there is > > ```text > var connectionString = $"Host={service}-db;Port=5432;Username={dbUser};Password={dbPassword};Database={dataBase}"; > ``` > > dbUser and Password are still the old DATABASE_USER and DATABASE_PASSWORD. This needs to be updated so that the correct username and password are used when trying to connect to a specific database Was just about to comment this. This issue basically covers 4 areas: compose files, installation scripts, middleware and all the service DataQueries. As you just said, middleware connects to all databases with the same user and password. This needs to be changed so that middleware tries to access ENERGY_DATABASE_USER if the service provided is energy, for example. Middleware right now does receive the service name so this should be possible.

a22erigr changed target branch from team_1_week_7 to both_teams_week_8

2026-05-27 08:57:59 +00:00

b25marem added 2 commits

2026-05-27 15:30:32 +00:00

Merge branch 'both_teams_week_8' into issue-988-db-passwords-week7 3f1b6dc53f

Fix stack specific database credentials 4834664cc7

b25marem added the

needs review

label

2026-05-27 15:34:05 +00:00

a22erigr requested review from a24timsv

2026-05-28 08:08:53 +00:00

a24timsv requested changes

2026-05-28 09:24:22 +00:00

a24timsv left a comment

Collaborator

Several issues was found:

Middleware could not insert into certain databases since the method for retrieving the username and password is not in that method.
All service's compose files was not modified, causing errors.
The WindowsInstallation script didn't generate all needed variables.
The general Database user and password should not exist, there shouldn't be a fallback system for usernames and passwords.
MENU_ICS_URL should not exist anymore.

The issues above has already been solved since to be able to review this, I needed to fix them. The commit below involves these fixes.

Several issues was found: - Middleware could not insert into certain databases since the method for retrieving the username and password is not in that method. - All service's compose files was not modified, causing errors. - The WindowsInstallation script didn't generate all needed variables. - The general Database user and password should not exist, there shouldn't be a fallback system for usernames and passwords. - MENU_ICS_URL should not exist anymore. The issues above has already been solved since to be able to review this, I needed to fix them. The commit below involves these fixes.

a24timsv added 1 commit

2026-05-28 09:25:30 +00:00

Issue fixes 7d6ae330a2

Fixed the following issues:
- Middleware could not insert into certain databases since the method for retrieving the username and password is not in that method.
- All service's compose files was not modified, causing errors.
- The WindowsInstallation script didn't generate all needed variables.
- The general Database user and password should not exist, there shouldn't be a fallback system for usernames and passwords.
- MENU_ICS_URL should not exist anymore.

a24timsv commented

2026-05-28 09:26:04 +00:00

Collaborator

Theses fixes don't fix the solar service. It has wrongly typed database queries.

a24timsv added 1 commit

2026-05-28 09:57:30 +00:00

Updated UnixRebuild to include solar service c0e168af89

a24timsv added 1 commit

2026-05-28 09:59:41 +00:00

Another update to UnixRebuild 40dd48f3fb

a24sakma approved these changes

2026-05-28 10:10:26 +00:00

a24sakma left a comment

Collaborator

what has been reviewed

the code seems follow the logic for creation of different users and databases for each service
it has been test on both on linux and windows

Important notes

remove .env file
run installation script
run rebuild

OBG: you need to remove your old .env as it uses only one user and one password for all services

# what has been reviewed 1. the code seems follow the logic for creation of different users and databases for each service 2. it has been test on both on linux and windows # Important notes remove .env file run installation script run rebuild OBG: you need to remove your old .env as it uses only one user and one password for all services