BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #461 from jfederico/master

Browse Source 
bbb-lti: Fixed issue that prevented https to work on nginx/tomcat
This commit is contained in:
Jesus Federico 2014-12-10 11:34:03 -05:00
commit 821d4cbe01
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bbb-lti/grails-app/controllers/org/bigbluebutton/ToolController.groovy
View File

@ -54,7 +54,7 @@ class ToolController {
ltiService.logParameters(params)
if( request.post ){
def endPoint = (request.isSecure()?"https":"http") + "://" + ltiService.endPoint + "/" + grailsApplication.metadata['app.name'] + "/" + params.get("controller") + (params.get("format") != null? "." + params.get("format"): "")
def endPoint = getScheme() + "://" + ltiService.endPoint + "/" + grailsApplication.metadata['app.name'] + "/" + params.get("controller") + (params.get("format") != null? "." + params.get("format"): "")
Map<String, String> result = new HashMap<String, String>()
ArrayList<String> missingParams = new ArrayList<String>()
@ -398,4 +398,18 @@ class ToolController {
return cartridge
}
private String getScheme(){
def scheme
if ( request.isSecure() ) {
scheme = 'https'
} else {
scheme = request.getHeader("scheme")
if ( scheme == null || !(scheme == 'http' || scheme == 'https') ) {
scheme = 'http'
}
}
return scheme
}
}

1
bbb-lti/lti.nginx
View File

@ -4,6 +4,7 @@
proxy_pass http://127.0.0.1:8080;
proxy_redirect default;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Scheme $scheme;
# Allow 30M uploaded presentation document.
client_max_body_size 30m;