Skip to content

Commit 00692e0

Browse files
authored
Webauthn support (#18)
* webauthn support - Added parsing for webauthn challenges - Added validateCheck variant for webauthn - Replaced URLHttpConnection with okhttp3 - Rename various classes for better distinction between sdk and plugin * disable logging of headers * licenses and comments * optimize imports * add okhttp3 dependency to packaging
1 parent 678bebf commit 00692e0

24 files changed

+954
-424
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
target/
22
.idea/
33
sdk-java.iml
4+
dependency-reduced-pom.xml

pom.xml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,46 @@
1313
</properties>
1414

1515
<build>
16+
<finalName>sdk-java</finalName>
1617
<plugins>
1718
<plugin>
1819
<groupId>org.apache.maven.plugins</groupId>
19-
<artifactId>maven-compiler-plugin</artifactId>
20+
<artifactId>maven-surefire-plugin</artifactId>
21+
<version>2.12.4</version>
2022
<configuration>
21-
<source>8</source>
22-
<target>8</target>
23+
<skipTests>false</skipTests>
2324
</configuration>
2425
</plugin>
2526

2627
<plugin>
27-
<artifactId>maven-assembly-plugin</artifactId>
28+
<groupId>org.apache.maven.plugins</groupId>
29+
<artifactId>maven-shade-plugin</artifactId>
30+
<version>3.2.4</version>
2831
<executions>
2932
<execution>
3033
<phase>package</phase>
3134
<goals>
32-
<goal>single</goal>
35+
<goal>shade</goal>
3336
</goals>
37+
<configuration>
38+
<artifactSet>
39+
<includes>
40+
<include>com.google.code.gson</include>
41+
<include>com.squareup.okhttp3</include>
42+
</includes>
43+
</artifactSet>
44+
</configuration>
3445
</execution>
3546
</executions>
47+
</plugin>
48+
49+
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-compiler-plugin</artifactId>
52+
<version>3.8.1</version>
3653
<configuration>
37-
<descriptorRefs>
38-
<descriptorRef>jar-with-dependencies</descriptorRef>
39-
</descriptorRefs>
54+
<source>1.8</source>
55+
<target>1.8</target>
4056
</configuration>
4157
</plugin>
4258
</plugins>
@@ -50,6 +66,12 @@
5066
<scope>test</scope>
5167
</dependency>
5268

69+
<dependency>
70+
<groupId>com.squareup.okhttp3</groupId>
71+
<artifactId>okhttp</artifactId>
72+
<version>4.9.0</version>
73+
</dependency>
74+
5375
<dependency>
5476
<groupId>com.google.code.gson</groupId>
5577
<artifactId>gson</artifactId>

src/main/java/org/privacyidea/Challenge.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* Copyright 2021 NetKnights GmbH - [email protected]
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.privacyidea;
217

318
import java.util.ArrayList;

src/main/java/org/privacyidea/Configuration.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/org/privacyidea/Constants.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)