Skip to content

Commit da3ab44

Browse files
committed
Fixing LTI2Servlet
1 parent 8005d6b commit da3ab44

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
/target/
1+
/target/
2+
.idea/
3+
*.iml

src/main/java/org/imsglobal/lti2/LTI2Servlet.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@
3232
import javax.servlet.http.HttpServletRequest;
3333
import javax.servlet.http.HttpServletResponse;
3434

35+
import org.apache.commons.httpclient.HttpStatus;
3536
import org.apache.commons.logging.Log;
3637
import org.apache.commons.logging.LogFactory;
3738
import org.codehaus.jackson.map.ObjectMapper;
3839
import org.codehaus.jackson.map.ObjectWriter;
3940
import org.imsglobal.basiclti.BasicLTIConstants;
4041
import org.imsglobal.basiclti.BasicLTIUtil;
42+
import org.imsglobal.basiclti.LtiVerificationResult;
4143
import org.imsglobal.json.IMSJSONRequest;
4244
import org.imsglobal.lti2.objects.Service_offered;
4345
import org.imsglobal.lti2.objects.StandardServices;
@@ -546,10 +548,10 @@ public void handleSettingsRequest(HttpServletRequest request,HttpServletResponse
546548
String oauth_secret = (String) security_contract.get(LTI2Constants.SHARED_SECRET);
547549

548550
// Validate the incoming message
549-
Object retval = BasicLTIUtil.validateMessage(request, URL, oauth_secret);
550-
if ( retval instanceof String ) {
551-
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
552-
doErrorJSON(request,response, jsonRequest, (String) retval, null);
551+
LtiVerificationResult result = BasicLTIUtil.validateMessage(request, URL, oauth_secret);
552+
if (!result.getSuccess()) {
553+
response.setStatus(HttpStatus.SC_FORBIDDEN);
554+
doErrorJSON(request,response, jsonRequest, result.getMessage(), null);
553555
return;
554556
}
555557

0 commit comments

Comments
 (0)