neviyn/ObservationDatabase
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Moved password required for submissions to external configuration file.

Browse Source
This commit is contained in:
neviyn 2018-10-10 10:09:28 +01:00
parent 1f8f5889cc
commit bd2aa557b4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Security.kt
View File

@ -3,6 +3,7 @@ package uk.co.neviyn.observationdatabase
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Configuration
import org.springframework.core.env.Environment
import org.springframework.http.HttpMethod import org.springframework.http.HttpMethod
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.builders.HttpSecurity
@ -25,12 +26,14 @@ class CustomWebSecurityConfigurerAdapter : WebSecurityConfigurerAdapter() {
@Autowired @Autowired
lateinit var authenticationEntryPoint: MyBasicAuthenticationEntryPoint lateinit var authenticationEntryPoint: MyBasicAuthenticationEntryPoint
@Autowired
lateinit var environment: Environment
@Autowired @Autowired
@Throws(Exception::class) @Throws(Exception::class)
fun configureGlobal(auth: AuthenticationManagerBuilder) { fun configureGlobal(auth: AuthenticationManagerBuilder) {
auth.inMemoryAuthentication() auth.inMemoryAuthentication()
.withUser("admin").password(passwordEncoder().encode("admin")) .withUser("admin").password(passwordEncoder().encode(environment.getProperty("obsdb.password")))
.authorities("ROLE_USER") .authorities("ROLE_USER")
} }

1
backend/src/main/resources/application.properties
View File

@ -1,3 +1,4 @@
spring.jpa.properties.jadira.usertype.autoRegisterUserTypes = true spring.jpa.properties.jadira.usertype.autoRegisterUserTypes = true
spring.datasource.url=jdbc:h2:file:./database spring.datasource.url=jdbc:h2:file:./database
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
obsdb.password=observation