Reformat with 0.3.0-RC1 #6

Open
wants to merge 1 commit into
from
The table of contents is too big for display.
+363,594 −308,108
Diff settings

Always

Just for now

The diff you're trying to view is too large. We only load the first 3000 changed files.
@@ -34,20 +34,24 @@ trait KeyAuthentication {
val param = "accessKey"
}
- def withAccessKeyFromFile: RequestContext => Future[Authentication[
- HttpRequest]] = { ctx: RequestContext =>
+ def withAccessKeyFromFile: RequestContext => Future[
+ Authentication[HttpRequest]] = { ctx: RequestContext =>
val accessKeyParamOpt = ctx.request.uri.query.get(ServerKey.param)
Future {
val passedKey = accessKeyParamOpt.getOrElse {
- Left(AuthenticationFailedRejection(
- AuthenticationFailedRejection.CredentialsRejected, List()))
+ Left(
+ AuthenticationFailedRejection(
+ AuthenticationFailedRejection.CredentialsRejected,
+ List()))
}
if (passedKey.equals(ServerKey.get)) Right(ctx.request)
else
- Left(AuthenticationFailedRejection(
- AuthenticationFailedRejection.CredentialsRejected, List()))
+ Left(
+ AuthenticationFailedRejection(
+ AuthenticationFailedRejection.CredentialsRejected,
+ List()))
}
}
}
@@ -40,7 +40,7 @@ trait SSLConfiguration {
// Loading keystore from specified file
val clientStore = KeyStore.getInstance("JKS")
val inputStream = new FileInputStream(
- getClass().getClassLoader().getResource(keyStoreResource).getFile())
+ getClass().getClassLoader().getResource(keyStoreResource).getFile())
clientStore.load(inputStream, password.toCharArray)
inputStream.close()
clientStore
@@ -62,9 +62,10 @@ trait SSLConfiguration {
// provide implicit SSLEngine with some protocols
implicit def sslEngineProvider: ServerSSLEngineProvider = {
ServerSSLEngineProvider { engine =>
- engine.setEnabledCipherSuites(Array("TLS_RSA_WITH_AES_256_CBC_SHA",
- "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
- "TLS_RSA_WITH_AES_128_CBC_SHA"))
+ engine.setEnabledCipherSuites(
+ Array("TLS_RSA_WITH_AES_256_CBC_SHA",
+ "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
+ "TLS_RSA_WITH_AES_128_CBC_SHA"))
engine.setEnabledProtocols(Array("TLSv1", "TLSv1.2", "TLSv1.1"))
engine
}
Oops, something went wrong.