filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed CasValidator -> DefaultUAMCasValidator

Browse Source 
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
This commit is contained in:
Marcin Woźniak 2020-12-02 12:38:17 +01:00
parent c3fd450499
commit 7d747b60a8
Signed by: y0rune
GPG Key ID: F204C385F57EB348
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
restservice/src/main/java/com/plannaplan/controllers/TokenController.java
View File

@ -2,7 +2,7 @@ package com.plannaplan.controllers;
import com.plannaplan.exceptions.UserNotFoundException; import com.plannaplan.exceptions.UserNotFoundException;
import com.plannaplan.security.CasValidationExcepiton; import com.plannaplan.security.CasValidationExcepiton;
import com.plannaplan.security.CasValidator; import com.plannaplan.security.DefaultUAMCasValidator;
import com.plannaplan.services.UserService; import com.plannaplan.services.UserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -31,7 +31,7 @@ public class TokenController {
@ApiOperation(value = "Endpoint to access token required to call secured endpoints. In order to access token we need to provide access token comming from unviersity CAS system") @ApiOperation(value = "Endpoint to access token required to call secured endpoints. In order to access token we need to provide access token comming from unviersity CAS system")
public ResponseEntity<String> getToken( public ResponseEntity<String> getToken(
@RequestParam("ticket") @ApiParam(value = "Ticket get from CAS system. It should look like ST-1376572-wo41gty5R0JCZFKMMie2-cas.amu.edu.pl") final String ticket) { @RequestParam("ticket") @ApiParam(value = "Ticket get from CAS system. It should look like ST-1376572-wo41gty5R0JCZFKMMie2-cas.amu.edu.pl") final String ticket) {
final CasValidator validator = new CasValidator(SERVICE_URL, ticket); final DefaultUAMCasValidator validator = new DefaultUAMCasValidator(SERVICE_URL, ticket);
try { try {
String authority = validator.validate(); String authority = validator.validate();

6
restservice/src/main/java/com/plannaplan/security/CasValidator.java → restservice/src/main/java/com/plannaplan/security/DefaultUAMCasValidator.java
View File

@ -9,19 +9,19 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
public class CasValidator { public class DefaultUAMCasValidator {
private static String CAS_URL = "https://cas.amu.edu.pl/cas"; private static String CAS_URL = "https://cas.amu.edu.pl/cas";
private final CloseableHttpClient httpClient = HttpClients.createDefault(); private final CloseableHttpClient httpClient = HttpClients.createDefault();
private String service; private String service;
private String ticket; private String ticket;
public CasValidator(String service, String ticket) { public DefaultUAMCasValidator(String service, String ticket) {
this.service = service; this.service = service;
this.ticket = ticket; this.ticket = ticket;
} }
public String validate() throws Exception, CasValidationExcepiton { public String validate() throws Exception, CasValidationExcepiton {
HttpGet request = new HttpGet(CasValidator.CAS_URL + "/validate?service=" HttpGet request = new HttpGet(DefaultUAMCasValidator.CAS_URL + "/validate?service="
+ URLEncoder.encode(this.service, "UTF-8") + "&ticket=" + URLEncoder.encode(this.ticket, "UTF-8")); + URLEncoder.encode(this.service, "UTF-8") + "&ticket=" + URLEncoder.encode(this.ticket, "UTF-8"));
try (CloseableHttpResponse response = httpClient.execute(request)) { try (CloseableHttpResponse response = httpClient.execute(request)) {

6
restservice/src/test/java/com/plannaplan/security/CasValidatorTest.java → restservice/src/test/java/com/plannaplan/security/DefaultUAMCasValidatorTest.java
View File

@ -5,14 +5,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
public class CasValidatorTest { public class DefaultUAMCasValidatorTest {
@Test @Test
@Ignore @Ignore
public void shouldValidateTicket() { public void shouldValidateTicket() {
// you need to privide fresh ticket to make this test pass that's why it is // you need to privide fresh ticket to make this test pass that's why it is
// marked as ignored // marked as ignored
final CasValidator validator = new CasValidator("http://localhost:3000", final DefaultUAMCasValidator validator = new DefaultUAMCasValidator("http://localhost:3000",
"ST-572267-cbgKrcJLd0tdCubeLqdW-cas.amu.edu.pl"); "ST-572267-cbgKrcJLd0tdCubeLqdW-cas.amu.edu.pl");
try { try {
System.out.println(validator.validate()); System.out.println(validator.validate());
@ -24,7 +24,7 @@ public class CasValidatorTest {
@Test @Test
public void shouldNotValidateTicket() { public void shouldNotValidateTicket() {
final CasValidator validator = new CasValidator("http://localhost:3000", "notticket"); final DefaultUAMCasValidator validator = new DefaultUAMCasValidator("http://localhost:3000", "notticket");
try { try {
assertTrue(validator.validate().trim().equals("")); assertTrue(validator.validate().trim().equals(""));
} catch (CasValidationExcepiton e) { } catch (CasValidationExcepiton e) {