Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

handle CORS preflight request for profile upload (Safari)

Browse source
This commit is contained in:
Norbert Renner 2015-03-31 15:55:43 +02:00
parent 062702c5a3
commit 99fb471c26
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
brouter-server/src/main/java/btools/server/RouteServer.java
View file

@ -67,20 +67,32 @@ public class RouteServer extends Thread
}
else if ( url.startsWith( PROFILE_UPLOAD_URL ) )
{
writeHttpHeader(bw, "application/json");
String profileId = null;
if ( url.length() > PROFILE_UPLOAD_URL.length() + 1 )
if ( getline.startsWith("OPTIONS") )
{
// e.g. /brouter/profile/custom_1400767688382
profileId = url.substring(PROFILE_UPLOAD_URL.length() + 1);
// handle CORS preflight request (Safari)
String corsHeaders = "Access-Control-Allow-Methods: GET, POST\n"
+ "Access-Control-Allow-Headers: Content-Type\n";
writeHttpHeader( bw, "text/plain", null, corsHeaders );
bw.flush();
return;
}
else
{
writeHttpHeader(bw, "application/json");
ProfileUploadHandler uploadHandler = new ProfileUploadHandler( serviceContext );
uploadHandler.handlePostRequest( profileId, br, bw );
String profileId = null;
if ( url.length() > PROFILE_UPLOAD_URL.length() + 1 )
{
// e.g. /brouter/profile/custom_1400767688382
profileId = url.substring(PROFILE_UPLOAD_URL.length() + 1);
}
bw.flush();
return;
ProfileUploadHandler uploadHandler = new ProfileUploadHandler( serviceContext );
uploadHandler.handlePostRequest( profileId, br, bw );
bw.flush();
return;
}
}
else
{
@ -213,6 +225,11 @@ public class RouteServer extends Thread
}
private static void writeHttpHeader( BufferedWriter bw, String mimeType, String fileName ) throws IOException
{
writeHttpHeader( bw, mimeType, fileName, null);
}
private static void writeHttpHeader( BufferedWriter bw, String mimeType, String fileName, String headers ) throws IOException
{
// http-header
bw.write( "HTTP/1.1 200 OK\n" );
@ -223,6 +240,10 @@ public class RouteServer extends Thread
bw.write( "Content-Disposition: attachment; filename=" + fileName + "\n" );
}
bw.write( "Access-Control-Allow-Origin: *\n" );
if ( headers != null )
{
bw.write( headers );
}
bw.write( "\n" );
}
}