Skip to content

Commit b93d1df

Browse files
author
merit\rembjo0
committed
Fix whitespace in source files
This patch modifies whitespace in areas touched by the previous commit. Attempts to use the same whitespace as the rest of the file. This minimizes clutter in the diff and should improve formatting.
1 parent e1a9d09 commit b93d1df

10 files changed

Lines changed: 116 additions & 122 deletions

File tree

‎core/src/main/java/com/onelogin/saml2/http/HttpRequest.java‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
* @since 2.0.0
2424
*/
2525
public final class HttpRequest {
26-
27-
public static final Map<String, List<String>> EMPTY_PARAMETERS = Collections.<String, List<String>>emptyMap();
28-
26+
27+
public static final Map<String, List<String>> EMPTY_PARAMETERS = Collections.<String, List<String>>emptyMap();
28+
2929
private final String requestURL;
3030
private final Map<String, List<String>> parameters;
3131
private final String queryString;
@@ -47,9 +47,9 @@ public HttpRequest(String requestURL) {
4747
* @param query string that is contained in the request URL after the path
4848
*/
4949
public HttpRequest(String requestURL, String queryString) {
50-
this(requestURL, EMPTY_PARAMETERS, queryString);
50+
this(requestURL, EMPTY_PARAMETERS, queryString);
5151
}
52-
52+
5353
/**
5454
* Creates a new HttpRequest.
5555
*
@@ -58,9 +58,9 @@ public HttpRequest(String requestURL, String queryString) {
5858
* @throws NullPointerException if any of the parameters is null
5959
*/
6060
public HttpRequest(String requestURL, Map<String, List<String>> parameters) {
61-
this(requestURL, parameters, null);
62-
}
63-
61+
this(requestURL, parameters, null);
62+
}
63+
6464
/**
6565
* Creates a new HttpRequest.
6666
*
@@ -75,7 +75,6 @@ public HttpRequest(String requestURL, Map<String, List<String>> parameters, Stri
7575
this.queryString = StringUtils.trimToEmpty(queryString);
7676
}
7777

78-
7978
/**
8079
* @param name the query parameter name
8180
* @param value the query parameter value
@@ -148,34 +147,33 @@ public Map<String, List<String>> getParameters() {
148147
* Return an url encoded get parameter value
149148
* Prefer to extract the original encoded value directly from queryString since url
150149
* encoding is not canonical.
151-
*
150+
*
152151
* @param name
153152
* @return the first value for the parameter, or null
154153
*/
155-
public String getEncodedParameter(String name) {
156-
Matcher matcher = Pattern.compile(Pattern.quote(name) + "=([^&]+)").matcher(queryString);
157-
if (matcher.find()) {
158-
return matcher.group(1);
159-
} else {
160-
return Util.urlEncoder(getParameter(name));
161-
}
154+
public String getEncodedParameter(String name) {
155+
Matcher matcher = Pattern.compile(Pattern.quote(name) + "=([^&]+)").matcher(queryString);
156+
if (matcher.find()) {
157+
return matcher.group(1);
158+
} else {
159+
return Util.urlEncoder(getParameter(name));
160+
}
162161
}
163-
162+
164163
/**
165164
* Return an url encoded get parameter value
166165
* Prefer to extract the original encoded value directly from queryString since url
167166
* encoding is not canonical.
168-
*
167+
*
169168
* @param name
170-
* @param defaultValue
171-
* @return the first value for the parameter, or url encoded default value
169+
* @param defaultValue
170+
* @return the first value for the parameter, or url encoded default value
172171
*/
173-
public String getEncodedParameter(String name, String defaultValue) {
174-
String value = getEncodedParameter(name);
175-
return (value != null ? value : Util.urlEncoder(defaultValue));
176-
}
172+
public String getEncodedParameter(String name, String defaultValue) {
173+
String value = getEncodedParameter(name);
174+
return (value != null ? value : Util.urlEncoder(defaultValue));
175+
}
177176

178-
179177
@Override
180178
public boolean equals(Object o) {
181179
if (this == o) {
@@ -202,7 +200,7 @@ public String toString() {
202200
return "HttpRequest{" +
203201
"requestURL='" + requestURL + '\'' +
204202
", parameters=" + parameters +
205-
", queryString=" + queryString +
203+
", queryString=" + queryString +
206204
'}';
207205
}
208206

@@ -216,4 +214,4 @@ private static Map<String, List<String>> unmodifiableCopyOf(Map<String, List<Str
216214
}
217215

218216

219-
}
217+
}

‎core/src/main/java/com/onelogin/saml2/logout/LogoutRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public Boolean isValid() throws Exception {
343343
}
344344

345345
signedQuery += "&SigAlg=" + request.getEncodedParameter("SigAlg", signAlg);
346-
346+
347347
if (!Util.validateBinarySignature(signedQuery, Util.base64decoder(signature), cert, signAlg)) {
348348
throw new ValidationError("Signature validation failed. Logout Request rejected", ValidationError.INVALID_SIGNATURE);
349349
}

‎core/src/main/java/com/onelogin/saml2/logout/LogoutResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public Boolean isValid(String requestId) {
228228
}
229229

230230
signedQuery += "&SigAlg=" + request.getEncodedParameter("SigAlg", signAlg);
231-
231+
232232
if (!Util.validateBinarySignature(signedQuery, Util.base64decoder(signature), cert, signAlg)) {
233233
throw new ValidationError("Signature validation failed. Logout Response rejected", ValidationError.INVALID_SIGNATURE);
234234
}

‎core/src/test/java/com/onelogin/saml2/http/HttpRequestTest.java‎

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void testConstructorWithQueryParams() throws Exception {
4747
assertThat(request.getParameters(name), equalTo(values));
4848
assertThat(request.getParameter(name), equalTo(value1));
4949
}
50-
50+
5151
@Test
5252
public void testAddParameter() throws Exception {
5353
final String url = "some_url";
@@ -59,7 +59,7 @@ public void testAddParameter() throws Exception {
5959
assertThat(request.getParameters(), equalTo(singletonMap(name, singletonList(value))));
6060
assertThat(request.getParameters(name), equalTo(singletonList(value)));
6161
assertThat(request.getParameter(name), equalTo(value));
62-
62+
6363
final HttpRequest request2 = request.addParameter(name, value);
6464
assertThat(request2.getParameters(name), equalTo(Arrays.asList(value, value)));
6565
}
@@ -75,114 +75,111 @@ public void testRemoveParameter() throws Exception {
7575
assertThat(request.getParameters(), equalTo(singletonMap(name, singletonList(value))));
7676
assertThat(request.getParameters(name), equalTo(singletonList(value)));
7777
assertThat(request.getParameter(name), equalTo(value));
78-
78+
7979
request = request.removeParameter(name);
8080
assertThat(request.getRequestURL(), equalTo(url));
8181
assertTrue(request.getParameters().isEmpty());
8282
assertTrue(request.getParameters(name).isEmpty());
8383
assertNull(request.getParameter(name));
8484
}
85-
85+
8686
@Test
8787
public void testGetEncodedParameter_encodesParametersNotOnQueryString() throws Exception {
8888
final String url = "url";
8989
final String name = "name";
9090
final String value1 = "val/1!";
9191
final String addedName = "added";
9292
final String addedValue = "added#value!";
93-
93+
9494
final List<String> values = Arrays.asList(value1);
9595
final Map<String, List<String>> parametersMap = singletonMap(name, values);
9696

97-
final HttpRequest request = new HttpRequest(url, parametersMap).addParameter(addedName, addedValue);
98-
97+
final HttpRequest request = new HttpRequest(url, parametersMap).addParameter(addedName, addedValue);
98+
9999
assertThat(request.getEncodedParameter(name), equalTo(Util.urlEncoder(value1)));
100-
assertThat(request.getEncodedParameter(addedName), equalTo(Util.urlEncoder(addedValue)));
101-
}
100+
assertThat(request.getEncodedParameter(addedName), equalTo(Util.urlEncoder(addedValue)));
101+
}
102102

103103
@Test
104104
public void testGetEncodedParameter_prefersValueFromQueryString() throws Exception {
105105
final String url = "url";
106106
final String name = "name";
107107
final String value1 = "value1";
108108
final String urlValue1 = "onUrl1";
109-
final String queryString = name + "=" + urlValue1;
110-
109+
final String queryString = name + "=" + urlValue1;
110+
111111
final List<String> values = Arrays.asList(value1);
112112
final Map<String, List<String>> parametersMap = singletonMap(name, values);
113113

114-
final HttpRequest request = new HttpRequest(url, parametersMap, queryString);
115-
114+
final HttpRequest request = new HttpRequest(url, parametersMap, queryString);
115+
116116
assertThat(request.getEncodedParameter(name), equalTo(urlValue1));
117117
assertThat(request.getParameter(name), equalTo(value1));
118-
}
118+
}
119119

120120
@Test
121121
public void testGetEncodedParameter_returnsExactAsGivenInQueryString() throws Exception {
122122
final String url = "url";
123123
final String name = "name";
124124
String encodedValue1 = NaiveUrlEncoder.encode("do not alter!");
125-
final String queryString = name + "=" + encodedValue1;
126-
127-
final HttpRequest request = new HttpRequest(url, queryString);
128-
125+
final String queryString = name + "=" + encodedValue1;
126+
127+
final HttpRequest request = new HttpRequest(url, queryString);
128+
129129
assertThat(request.getEncodedParameter(name), equalTo(encodedValue1));
130-
}
131-
130+
}
131+
132132
@Test
133133
public void testGetEncodedParameter_handlesMultipleValuesOnQueryString() throws Exception {
134-
final String url = "url";
135-
final String queryString = "k1=v1&k2=v2&k3=v3";
136-
134+
final String url = "url";
135+
final String queryString = "k1=v1&k2=v2&k3=v3";
136+
137137
final Map<String, List<String>> parametersMap = new HashMap<>();
138-
final HttpRequest request = new HttpRequest(url, parametersMap, queryString);
139-
138+
final HttpRequest request = new HttpRequest(url, parametersMap, queryString);
139+
140140
assertThat(request.getEncodedParameter("k1"), equalTo("v1"));
141141
assertThat(request.getEncodedParameter("k2"), equalTo("v2"));
142142
assertThat(request.getEncodedParameter("k3"), equalTo("v3"));
143-
}
144-
145-
143+
}
144+
146145
@Test
147146
public void testGetEncodedParameter_withDefault_usesDefaultWhenParameterMissing() throws Exception {
148-
final String url = "url";
149-
final String foobar = "foo/bar!";
150-
151-
final HttpRequest request = new HttpRequest(url);
147+
final String url = "url";
148+
final String foobar = "foo/bar!";
149+
150+
final HttpRequest request = new HttpRequest(url);
152151
assertThat(request.getEncodedParameter("missing", foobar), equalTo(Util.urlEncoder(foobar)));
153-
}
154-
155-
152+
}
153+
154+
156155
@Test
157156
public void testAddParameter_preservesQueryString() throws Exception {
158157
final String url = "url";
159158
final String name = "name";
160159
final String value1 = "val/1!";
161160
String encodedValue1 = NaiveUrlEncoder.encode(value1);
162-
final String queryString = name + "=" + encodedValue1;
163-
161+
final String queryString = name + "=" + encodedValue1;
162+
164163
final Map<String, List<String>> parametersMap = new HashMap<>();
165-
final HttpRequest request = new HttpRequest(url, parametersMap, queryString).addParameter(name, value1);
166-
164+
final HttpRequest request = new HttpRequest(url, parametersMap, queryString).addParameter(name, value1);
165+
167166
assertThat(request.getEncodedParameter(name), equalTo(encodedValue1));
168-
}
167+
}
169168

170169
@Test
171170
public void testRemoveParameter_preservesQueryString() throws Exception {
172171
final String url = "url";
173172
final String name = "name";
174173
final String value1 = "val/1!";
175174
String encodedValue1 = NaiveUrlEncoder.encode(value1);
176-
final String queryString = name + "=" + encodedValue1;
177-
175+
final String queryString = name + "=" + encodedValue1;
176+
178177
final List<String> values = Arrays.asList(value1);
179178
final Map<String, List<String>> parametersMap = singletonMap(name, values);
180179

181180
final HttpRequest request = new HttpRequest(url, parametersMap, queryString).removeParameter(name);
182-
181+
183182
assertThat(request.getEncodedParameter(name), equalTo(encodedValue1));
184-
}
185-
183+
}
186184

187-
188185
}

‎core/src/test/java/com/onelogin/saml2/test/NaiveUrlEncodeTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
import com.onelogin.saml2.util.Util;
1010

1111
public class NaiveUrlEncodeTest {
12-
13-
@Test
14-
public void testDemonstratingUrlEncodingNotCanonical () throws UnsupportedEncodingException {
15-
String theString = "Hello World!";
16-
17-
String naiveEncoded = NaiveUrlEncoder.encode(theString);
18-
String propperEncoded = Util.urlEncoder(theString);
19-
20-
Assert.assertNotEquals("Encoded versions should differ", naiveEncoded, propperEncoded);
21-
Assert.assertEquals("Decoded versions equal", URLDecoder.decode(naiveEncoded, "UTF-8"), URLDecoder.decode(propperEncoded, "UTF-8"));
22-
}
23-
12+
13+
@Test
14+
public void testDemonstratingUrlEncodingNotCanonical () throws UnsupportedEncodingException {
15+
String theString = "Hello World!";
16+
17+
String naiveEncoded = NaiveUrlEncoder.encode(theString);
18+
String propperEncoded = Util.urlEncoder(theString);
19+
20+
Assert.assertNotEquals("Encoded versions should differ", naiveEncoded, propperEncoded);
21+
Assert.assertEquals("Decoded versions equal", URLDecoder.decode(naiveEncoded, "UTF-8"), URLDecoder.decode(propperEncoded, "UTF-8"));
22+
}
23+
2424
}

‎core/src/test/java/com/onelogin/saml2/test/NaiveUrlEncoder.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
public final class NaiveUrlEncoder {
66

7-
private NaiveUrlEncoder () {
8-
//static class only
9-
}
10-
11-
/**
12-
* Encodes ALL characters in URL using %xx encoding.<br>
13-
* This differs from 'normal' url encoding.
14-
*/
15-
public static String encode (String s) throws UnsupportedEncodingException {
16-
StringBuilder buf = new StringBuilder();
17-
for (byte b : s.getBytes("UTF-8")) {
18-
buf.append("%");
19-
buf.append(String.format("%02x", b));
20-
}
21-
return buf.toString();
22-
}
23-
24-
}
7+
private NaiveUrlEncoder () {
8+
//static class only
9+
}
10+
11+
/**
12+
* Encodes ALL characters in URL using %xx encoding.<br>
13+
* This differs from 'normal' url encoding.
14+
*/
15+
public static String encode (String s) throws UnsupportedEncodingException {
16+
StringBuilder buf = new StringBuilder();
17+
for (byte b : s.getBytes("UTF-8")) {
18+
buf.append("%");
19+
buf.append(String.format("%02x", b));
20+
}
21+
return buf.toString();
22+
}
23+
24+
}

0 commit comments

Comments
 (0)