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 SQL Server connection with removing username/secret #661

Merged
merged 6 commits into from
Jul 15, 2024
Merged
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
7 changes: 6 additions & 1 deletion center/application-sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ spring:
redirect-uri: ${MICROSOFT_RERIRECT_URL}
ignore-uri: '/api/auth,/agent/connect'
scope: 'https://graph.microsoft.com/User.Read'

spring:
datasource:
url: jdbc:sqlite:${app.location}/hydra_lab_center_db.sqlite
driver-class-name: org.sqlite.JDBC
username: sqlite
password: 98765432
app:
# Mail Address Format
default-user: ${DEFAULT_USER}
Expand Down
2 changes: 1 addition & 1 deletion center/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies {

compile group: 'org.apache.commons', name: 'commons-pool2', version: '2.7.0'

compile group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '7.4.0.jre8'
compile group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: '12.6.1.jre8'
// compile group: 'org.postgresql', name: 'postgresql', version: '42.2.14'

compile group: 'org.springframework.security', name: 'spring-security-oauth2-client', version: '5.2.2.RELEASE'
Expand Down
3 changes: 3 additions & 0 deletions center/src/main/resources/application-docker.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
spring:
datasource:
url: jdbc:sqlite:${app.location}/hydra_lab_center_docker_db.sqlite
driver-class-name: org.sqlite.JDBC
username: sqlite
password: 98765432

app:
location: /hydra/data
6 changes: 2 additions & 4 deletions center/src/main/resources/application-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ spring:
authorization-grant-type: authorization_code
redirect-uri: ${MICROSOFT_RERIRECT_URL}
ignore-uri: '/api/auth,/agent/connect'
scope: 'https://graph.microsoft.com/User.Read'
scope: ${MICROSOFT_AUTH_SCOPE:openid+profile+email}
datasource:
url: ${DB_URL}
url: ${DB_URL} # UAMI integrated only
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: ${DB_NAME}
password: ${DB_PASS}
jpa:
database-platform: org.hibernate.dialect.SQLServer2012Dialect
show-sql: false
Expand Down
7 changes: 7 additions & 0 deletions center/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
app:
default-user: '[email protected]'

spring:
datasource:
url: jdbc:sqlite:${app.location}/hydra_lab_center_db.sqlite
driver-class-name: org.sqlite.JDBC
username: sqlite
password: 98765432

management:
metrics:
export:
Expand Down
5 changes: 0 additions & 5 deletions center/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ spring:
multipart:
max-file-size: 1024MB
max-request-size: 2048MB
datasource:
url: jdbc:sqlite:${app.location}/hydra_lab_center_db.sqlite
username: sqlite
password: 98765432
driver-class-name: org.sqlite.JDBC
jpa:
database-platform: org.sqlite.hibernate.dialect.SQLiteDialect
show-sql: false
Expand Down
3 changes: 2 additions & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ dependencies {
compile group: 'org.jsoup', name: 'jsoup', version: '1.10.1'
// https://docs.microsoft.com/en-us/graph/sdks/sdk-installation?context=graph%2Fapi%2F1.0&view=graph-rest-1.0
compile 'com.microsoft.graph:microsoft-graph:5.4.0'
implementation 'com.azure:azure-identity:1.13.0'
compile 'com.azure:azure-identity:1.11.1'
compile 'com.azure:azure-identity-broker:1.1.2'
//blob storage
compile 'com.azure:azure-storage-blob:12.23.0'
//Apk analysis
Expand Down
Loading