Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
CTF
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grzegorz
CTF
Commits
57afa9bb
Commit
57afa9bb
authored
Apr 09, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add proxied headers to configuration
parent
5326152a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
3 deletions
+30
-3
configuration.local.yml
service/configuration.local.yml
+5
-0
configuration.prod.yml
service/configuration.prod.yml
+5
-0
ApplicationConfiguration.java
...honers/krakyournet/ctf/core/ApplicationConfiguration.java
+14
-0
TaskResource.java
...m/telephoners/krakyournet/ctf/resources/TaskResource.java
+6
-3
No files found.
service/configuration.local.yml
View file @
57afa9bb
...
@@ -15,6 +15,11 @@ startupConfiguration:
...
@@ -15,6 +15,11 @@ startupConfiguration:
digestMethod
:
"
MD5"
digestMethod
:
"
MD5"
proxiedHeaders
:
-
"
KYN_2016"
-
"
EY_HEADER"
-
"
Content-Type"
admins
:
admins
:
-
name
:
"
gpietrus_admin"
-
name
:
"
gpietrus_admin"
password
:
"
41b450e73c974fca46911eba84e114f2"
#gpietrus md5
password
:
"
41b450e73c974fca46911eba84e114f2"
#gpietrus md5
...
...
service/configuration.prod.yml
View file @
57afa9bb
...
@@ -15,6 +15,11 @@ startupConfiguration:
...
@@ -15,6 +15,11 @@ startupConfiguration:
digestMethod
:
"
MD5"
digestMethod
:
"
MD5"
proxiedHeaders
:
-
"
KYN_2016"
-
"
EY_HEADER"
-
"
Content-Type"
admins
:
admins
:
-
name
:
"
gpietrus_admin"
-
name
:
"
gpietrus_admin"
password
:
"
41b450e73c974fca46911eba84e114f2"
#gpietrus md5
password
:
"
41b450e73c974fca46911eba84e114f2"
#gpietrus md5
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/core/ApplicationConfiguration.java
View file @
57afa9bb
...
@@ -8,6 +8,7 @@ import io.dropwizard.Configuration;
...
@@ -8,6 +8,7 @@ import io.dropwizard.Configuration;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
public
class
ApplicationConfiguration
extends
Configuration
public
class
ApplicationConfiguration
extends
Configuration
{
{
...
@@ -38,6 +39,9 @@ public class ApplicationConfiguration extends Configuration
...
@@ -38,6 +39,9 @@ public class ApplicationConfiguration extends Configuration
@NotNull
@NotNull
private
StartupConfiguration
startupConfiguration
;
private
StartupConfiguration
startupConfiguration
;
@NotNull
private
Set
<
String
>
proxiedHeaders
;
public
List
<
User
>
getAdmins
()
public
List
<
User
>
getAdmins
()
{
{
return
admins
;
return
admins
;
...
@@ -132,4 +136,14 @@ public class ApplicationConfiguration extends Configuration
...
@@ -132,4 +136,14 @@ public class ApplicationConfiguration extends Configuration
{
{
this
.
startupConfiguration
=
startupConfiguration
;
this
.
startupConfiguration
=
startupConfiguration
;
}
}
public
Set
<
String
>
getProxiedHeaders
()
{
return
proxiedHeaders
;
}
public
void
setProxiedHeaders
(
Set
<
String
>
proxiedHeaders
)
{
this
.
proxiedHeaders
=
proxiedHeaders
;
}
}
}
service/src/main/java/com/telephoners/krakyournet/ctf/resources/TaskResource.java
View file @
57afa9bb
...
@@ -5,6 +5,7 @@ import com.telephoners.krakyournet.ctf.beans.User;
...
@@ -5,6 +5,7 @@ import com.telephoners.krakyournet.ctf.beans.User;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.beans.tasks.TaskRequestContext
;
import
com.telephoners.krakyournet.ctf.beans.tasks.TaskRequestContext
;
import
com.telephoners.krakyournet.ctf.beans.tasks.TaskResponse
;
import
com.telephoners.krakyournet.ctf.beans.tasks.TaskResponse
;
import
com.telephoners.krakyournet.ctf.core.ApplicationConfiguration
;
import
com.telephoners.krakyournet.ctf.helpers.StreamUtils
;
import
com.telephoners.krakyournet.ctf.helpers.StreamUtils
;
import
com.telephoners.krakyournet.ctf.repositories.TasksRepository
;
import
com.telephoners.krakyournet.ctf.repositories.TasksRepository
;
import
io.dropwizard.auth.Auth
;
import
io.dropwizard.auth.Auth
;
...
@@ -30,12 +31,13 @@ import java.util.stream.Collectors;
...
@@ -30,12 +31,13 @@ import java.util.stream.Collectors;
@Path
(
value
=
"/task"
)
@Path
(
value
=
"/task"
)
public
class
TaskResource
public
class
TaskResource
{
{
private
final
ApplicationConfiguration
applicationConfiguration
;
private
final
TasksRepository
tasksRepository
;
private
final
TasksRepository
tasksRepository
;
private
static
final
Set
<
String
>
PROXIED_HEADERS
=
Sets
.
newHashSet
(
"KYN_2016"
,
"EY_HEADER"
,
"Content-Type"
);
//todo: move to conf
@Inject
@Inject
public
TaskResource
(
TasksRepository
tasksRepository
)
public
TaskResource
(
ApplicationConfiguration
applicationConfiguration
,
TasksRepository
tasksRepository
)
{
{
this
.
applicationConfiguration
=
applicationConfiguration
;
this
.
tasksRepository
=
tasksRepository
;
this
.
tasksRepository
=
tasksRepository
;
}
}
...
@@ -62,9 +64,10 @@ public class TaskResource
...
@@ -62,9 +64,10 @@ public class TaskResource
*/
*/
private
Map
<
String
,
String
>
extractProxiedHeaders
(
MultivaluedMap
<
String
,
String
>
headers
)
{
private
Map
<
String
,
String
>
extractProxiedHeaders
(
MultivaluedMap
<
String
,
String
>
headers
)
{
Set
<
String
>
proxiedHeaders
=
applicationConfiguration
.
getProxiedHeaders
();
return
headers
.
entrySet
()
return
headers
.
entrySet
()
.
stream
()
.
stream
()
.
filter
(
header
->
PROXIED_HEADERS
.
contains
(
header
.
getKey
()))
.
filter
(
header
->
proxiedHeaders
.
contains
(
header
.
getKey
()))
.
collect
(
Collectors
.
toMap
(
.
collect
(
Collectors
.
toMap
(
Map
.
Entry
::
getKey
,
Map
.
Entry
::
getKey
,
entry
->
entry
.
getValue
().
get
(
0
)
//todo: check
entry
->
entry
.
getValue
().
get
(
0
)
//todo: check
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment