Skip to content

Commit

Permalink
add permissive CORS response header
Browse files Browse the repository at this point in the history 
* for the SPA web app:
  - requests are sent one-way to the server
  - responses are ignored
    * commands are issued
    * nothing meaningful is communicated back
  - lack of a CORS response header results in:
    * the browser blocking data in the response
    * a warning logged to the javascript console
  - adding this header:
    * makes no functional difference
    * prevents the log messages

* for other web clients:
  - there are AirPlay endpoints that return metadata
  - if any of this data is queried,
    this CORS header will permit the client to read it
  • Loading branch information
@warren-bank
warren-bank committed Feb 27, 2020
1 parent 9f6198f commit b557add
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 33 deletions.
55 changes: 24 additions & 31 deletions ...ava/com/github/warren_bank/exoplayer_airplay_receiver/httpcore/RequestListenerThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public void handle(HttpRequest httpRequest, HttpResponse httpResponse, HttpConte

httpResponse.setStatusCode(HttpStatus.SC_NO_CONTENT); //204 No Content
httpResponse.setHeader("Date", new Date().toString());
httpResponse.setHeader("Access-Control-Allow-Origin", origin);
httpResponse.setHeader("Access-Control-Allow-Origin", origin);
httpResponse.setHeader("Access-Control-Allow-Headers", headers);
httpResponse.setHeader("Access-Control-Allow-Methods", methods);
httpResponse.setHeader("Allow", methods);
Expand Down Expand Up @@ -356,14 +356,13 @@ public void handle(HttpRequest httpRequest, HttpResponse httpResponse, HttpConte
}
}
else if (target.equals(Constant.Target.SERVER_INFO)) {
setCommonHeaders(httpResponse, HttpStatus.SC_OK);

String responseStr = Constant.getServerInfoResponse(localMac);
httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
httpResponse.setEntity(new StringEntity(responseStr));
}
else if (target.equals(Constant.Target.STOP)) { //Stop message
httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);

Message msg = Message.obtain();
msg.what = Constant.Msg.Msg_Stop;
Expand All @@ -375,8 +374,7 @@ else if (target.equals(Constant.Target.STOP)) { //Stop message
photoCacheMaps.clear();
}
else if (target.equals(Constant.Target.PHOTO)) { //Pushed image
httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);

Message msg = Message.obtain();
msg.what = Constant.Msg.Msg_Photo;
Expand Down Expand Up @@ -437,8 +435,7 @@ else if (target.equals(Constant.Target.PLAY) && (entityContent != null)) { //Pus
if (playUrl.isEmpty()) {
Log.d(tag, "airplay video URL missing");

httpResponse.setStatusCode(HttpStatus.SC_BAD_REQUEST);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_BAD_REQUEST);
}
else {
Log.d(tag, "airplay playUrl = " + playUrl + "; start Pos = " + startPos);
Expand All @@ -451,8 +448,7 @@ else if (target.equals(Constant.Target.PLAY) && (entityContent != null)) { //Pus
msg.obj = map;
MainApp.broadcastMessage(msg);

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
}
}
else if (target.startsWith(Constant.Target.SCRUB)) { //POST is the seek operation. GET returns the position and duration of the play.
Expand Down Expand Up @@ -498,8 +494,7 @@ else if (target.startsWith(Constant.Target.SCRUB)) { //POST is the seek operatio
}
}

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
httpResponse.setEntity(returnBody);
}
else if (target.startsWith(Constant.Target.RATE)) { //Set playback rate (special case: 0 is pause)
Expand All @@ -514,8 +509,7 @@ else if (target.startsWith(Constant.Target.RATE)) { //Set playback rate (special
MainApp.broadcastMessage(msg);
}

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
}
//IOS 8.4.1 Never send this command (Youku does not send, Tencent video sends)
else if (target.equalsIgnoreCase(Constant.Target.PLAYBACK_INFO)) {
Expand Down Expand Up @@ -551,15 +545,14 @@ else if (target.equalsIgnoreCase(Constant.Target.PLAYBACK_INFO)) {
httpContext.setAttribute(Constant.ReverseMsg, Constant.getVideoEventMsg(sessionId, status));
}

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
httpResponse.setHeader("Content-Type", "text/x-apple-plist+xml");
httpResponse.setEntity(new StringEntity(playback_info));
}
else if (target.equals("/fp-setup")) {
Log.d(tag, "airplay setup content = " + new String(entityContent, "UTF-8"));
httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());

setCommonHeaders(httpResponse, HttpStatus.SC_OK);
}
// =======================================================================
// non-standard extended API methods:
Expand Down Expand Up @@ -591,8 +584,7 @@ else if (target.equals(Constant.Target.QUEUE) && (entityContent != null)) { //Ad
if (playUrl.isEmpty()) {
Log.d(tag, "airplay video URL missing");

httpResponse.setStatusCode(HttpStatus.SC_BAD_REQUEST);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_BAD_REQUEST);
}
else {
Log.d(tag, "airplay playUrl = " + playUrl + "; start Pos = " + startPos + "; referer = " + referUrl);
Expand All @@ -606,25 +598,22 @@ else if (target.equals(Constant.Target.QUEUE) && (entityContent != null)) { //Ad
msg.obj = map;
MainApp.broadcastMessage(msg);

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
}
}
else if (target.equals(Constant.Target.NEXT)) { //skip forward to next video in queue
Message msg = Message.obtain();
msg.what = Constant.Msg.Msg_Video_Next;
MainApp.broadcastMessage(msg);

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
}
else if (target.equals(Constant.Target.PREVIOUS)) { //skip backward to previous video in queue
Message msg = Message.obtain();
msg.what = Constant.Msg.Msg_Video_Prev;
MainApp.broadcastMessage(msg);

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
}
else if (target.startsWith(Constant.Target.VOLUME)) { //set audio volume (special case: 0 is mute)
String value = StringUtils.getQueryStringValue(target, "?value=");
Expand All @@ -638,16 +627,20 @@ else if (target.startsWith(Constant.Target.VOLUME)) { //set audio volume (specia
MainApp.broadcastMessage(msg);
}

httpResponse.setStatusCode(HttpStatus.SC_OK);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_OK);
}
// =======================================================================
else {
Log.d(tag, "airplay default not process");

httpResponse.setStatusCode(HttpStatus.SC_BAD_REQUEST);
httpResponse.setHeader("Date", new Date().toString());
setCommonHeaders(httpResponse, HttpStatus.SC_BAD_REQUEST);
}
}

private static void setCommonHeaders(HttpResponse httpResponse, int statusCode) {
httpResponse.setStatusCode(statusCode);
httpResponse.setHeader("Access-Control-Allow-Origin", "*");
httpResponse.setHeader("Date", new Date().toString());
}
}
}
4 changes: 2 additions & 2 deletions android-studio-project/constants.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project.ext {
releaseVersionCode = Integer.parseInt("001000316", 10)
releaseVersion = '001.00.03-16API'
releaseVersionCode = Integer.parseInt("001000416", 10)
releaseVersion = '001.00.04-16API'
minSdkVersion = 16
targetSdkVersion = 28
compileSdkVersion = 28
Expand Down

0 comments on commit b557add

Please sign in to comment.