New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
PAYARA-2575 Yubikey Integration #2702
Merged
Merged
Changes from 11 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
7c403f0
PAYARA-2575 Yubikey integration
MarkWareham 0895cd4
PAYARA-2575-Create-Yubikey-integration
3b25508
PAYARA-2575 Yubikey Integration
MarkWareham 01244aa
Merge branch 'master' of https://github.com/payara/Payara into Yubikey
MarkWareham 36938ce
PAYARA-2575 Yubikey Integration
MarkWareham c3c9bcd
PAYARA-2575 Yubikey Integration
MarkWareham 9d142fe
PAYARA-2575 Yubikey Integration
MarkWareham d8f6d87
Merge branch 'master' of https://github.com/payara/Payara into Yubikey
MarkWareham eb7a99c
PAYARA-2575 Yubikey Integration
MarkWareham f11fdde
PAYARA-2575 Yubikey Integration - updated copyrights
MarkWareham b81358a
PAYARA-2575 Yubikey Integration - updated copyrights
MarkWareham 621c006
PAYARA-2575 added Yubikey integration to embedded and web profiles
MarkWareham 8495492
PAYARA-2575 Yubikey integration. Added to web and embedded.
MarkWareham ede597a
PAYARA-2575 Yubikey Integration
MarkWareham b3134ea
PAYARA-2575 Yubikey integration. Added request tracing
MarkWareham a9b1af2
Merge changes from payara/Payara
MarkWareham e80c80f
PAYARA-2575 Yubikey Integration. Added MP-config support
MarkWareham 50504bf
PAYARA-2575 Yubikey Integration. Added MP-config support
MarkWareham 3fa422a
PAYARA-2575 Yubikey Integration
MarkWareham f22dc5f
Merge branch 'master' into Yubikey
MarkWareham fb07158
PAYARA-2575 Yubikey Integration
MarkWareham a4d045b
Merge branch 'Yubikey' of github.com:MarkWareham/Payara into Yubikey
MarkWareham 8092425
Merge payara/Payara master
MarkWareham ff62417
PAYARA-2575 Yubikey Integration
MarkWareham File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
|
|
||
| DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
|
|
||
| Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved. | ||
|
|
||
| The contents of this file are subject to the terms of either the GNU | ||
| General Public License Version 2 only ("GPL") or the Common Development | ||
| and Distribution License("CDDL") (collectively, the "License"). You | ||
| may not use this file except in compliance with the License. You can | ||
| obtain a copy of the License at | ||
| https://github.com/payara/Payara/blob/master/LICENSE.txt | ||
| See the License for the specific | ||
| language governing permissions and limitations under the License. | ||
|
|
||
| When distributing the software, include this License Header Notice in each | ||
| file and include the License file at glassfish/legal/LICENSE.txt. | ||
|
|
||
| GPL Classpath Exception: | ||
| The Payara Foundation designates this particular file as subject to the "Classpath" | ||
| exception as provided by the Payara Foundation in the GPL Version 2 section of the License | ||
| file that accompanied this code. | ||
|
|
||
| Modifications: | ||
| If applicable, add the following below the License Header, with the fields | ||
| enclosed by brackets [] replaced by your own identifying information: | ||
| "Portions Copyright [year] [name of copyright owner]" | ||
|
|
||
| Contributor(s): | ||
| If you wish your version of this file to be governed by only the CDDL or | ||
| only the GPL Version 2, indicate your decision by adding "[Contributor] | ||
| elects to include this software in this distribution under the [CDDL or GPL | ||
| Version 2] license." If you don't indicate a single choice of license, a | ||
| recipient has the option to distribute your version of this file under | ||
| either the CDDL, the GPL Version 2 or to extend the choice of license to | ||
| its licensees as provided above. However, if you add GPL Version 2 code | ||
| and therefore, elected the GPL Version 2 license, then the option applies | ||
| only if the new code is made subject to such option by the copyright | ||
| holder. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.glassfish.main.packager</groupId> | ||
| <artifactId>packages</artifactId> | ||
| <version>5.182-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>yubikey-authentication</artifactId> | ||
| <name>Yubikey Authentication Package</name> | ||
| <packaging>distribution-fragment</packaging> | ||
| <description>This pom describes how to assemble the Payara Yubikey Authentication package</description> | ||
|
|
||
| <properties> | ||
| <temp.dir>${project.build.directory}/dependency</temp.dir> | ||
| </properties> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>process-step1</id> | ||
| </execution> | ||
| <execution> | ||
| <id>process-step2</id> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>process-step3</id> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <profiles> | ||
| <profile> | ||
| <id>ips</id> | ||
| <activation> | ||
| <activeByDefault>false</activeByDefault> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-antrun-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>process-step4</id> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.glassfish.build</groupId> | ||
| <artifactId>glassfishbuild-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>process-step5</id> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-resources-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>copy-resources</id> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.yubico</groupId> | ||
| <artifactId>yubico-validation-client2</artifactId> | ||
| <version>${yubico-validation-client2.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>fish.payara.security</groupId> | ||
| <artifactId>yubikey-authentication</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
64 changes: 64 additions & 0 deletions
64
appserver/packager/yubikey-authentication/src/main/assembly/yubikey-authentication.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <!-- | ||
|
|
||
| DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
|
|
||
| Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved. | ||
|
|
||
| The contents of this file are subject to the terms of either the GNU | ||
| General Public License Version 2 only ("GPL") or the Common Development | ||
| and Distribution License("CDDL") (collectively, the "License"). You | ||
| may not use this file except in compliance with the License. You can | ||
| obtain a copy of the License at | ||
| https://github.com/payara/Payara/blob/master/LICENSE.txt | ||
| See the License for the specific | ||
| language governing permissions and limitations under the License. | ||
|
|
||
| When distributing the software, include this License Header Notice in each | ||
| file and include the License file at glassfish/legal/LICENSE.txt. | ||
|
|
||
| GPL Classpath Exception: | ||
| The Payara Foundation designates this particular file as subject to the "Classpath" | ||
| exception as provided by the Payara Foundation in the GPL Version 2 section of the License | ||
| file that accompanied this code. | ||
|
|
||
| Modifications: | ||
| If applicable, add the following below the License Header, with the fields | ||
| enclosed by brackets [] replaced by your own identifying information: | ||
| "Portions Copyright [year] [name of copyright owner]" | ||
|
|
||
| Contributor(s): | ||
| If you wish your version of this file to be governed by only the CDDL or | ||
| only the GPL Version 2, indicate your decision by adding "[Contributor] | ||
| elects to include this software in this distribution under the [CDDL or GPL | ||
| Version 2] license." If you don't indicate a single choice of license, a | ||
| recipient has the option to distribute your version of this file under | ||
| either the CDDL, the GPL Version 2 or to extend the choice of license to | ||
| its licensees as provided above. However, if you add GPL Version 2 code | ||
| and therefore, elected the GPL Version 2 license, then the option applies | ||
| only if the new code is made subject to such option by the copyright | ||
| holder. | ||
| --> | ||
| <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> | ||
|
|
||
| <id>stage-package</id> | ||
| <formats> | ||
| <format>dir</format> | ||
| </formats> | ||
|
|
||
| <includeBaseDirectory>false</includeBaseDirectory> | ||
| <fileSets> | ||
| <fileSet> | ||
| <directory>${temp.dir}/nucleus</directory><!--//TODO this wrong --> | ||
| <outputDirectory>${install.dir.name}/glassfish</outputDirectory> | ||
| </fileSet> | ||
| <fileSet> | ||
| <directory>${temp.dir}</directory> <!--//TODO this wrong? --> | ||
| <excludes> | ||
| <exclude>nucleus/**</exclude><!--//TODO this wrong --> | ||
| <exclude>pkg_proto.py</exclude> | ||
| </excludes> | ||
| <outputDirectory>${install.dir.name}</outputDirectory> | ||
| </fileSet> | ||
| </fileSets> | ||
| </assembly> |
61 changes: 61 additions & 0 deletions
61
appserver/packager/yubikey-authentication/src/main/resources/pkg_proto.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| #!/usr/bin/env python | ||
| # -*- coding: utf-8 -*- | ||
| # | ||
| # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
|
|
||
| # Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved. | ||
| # | ||
| # The contents of this file are subject to the terms of either the GNU | ||
| # General Public License Version 2 only ("GPL") or the Common Development | ||
| # and Distribution License("CDDL") (collectively, the "License"). You | ||
| # may not use this file except in compliance with the License. You can | ||
| # obtain a copy of the License at | ||
| # https://github.com/payara/Payara/blob/master/LICENSE.txt | ||
| # See the License for the specific | ||
| # language governing permissions and limitations under the License. | ||
| # | ||
| # When distributing the software, include this License Header Notice in each | ||
| # file and include the License file at glassfish/legal/LICENSE.txt. | ||
| # | ||
| # GPL Classpath Exception: | ||
| # The Payara Foundation designates this particular file as subject to the "Classpath" | ||
| # exception as provided by the Payara Foundation in the GPL Version 2 section of the License | ||
| # file that accompanied this code. | ||
| # | ||
| # Modifications: | ||
| # If applicable, add the following below the License Header, with the fields | ||
| # enclosed by brackets [] replaced by your own identifying information: | ||
| # "Portions Copyright [year] [name of copyright owner]" | ||
| # | ||
| # Contributor(s): | ||
| # If you wish your version of this file to be governed by only the CDDL or | ||
| # only the GPL Version 2, indicate your decision by adding "[Contributor] | ||
| # elects to include this software in this distribution under the [CDDL or GPL | ||
| # Version 2] license." If you don't indicate a single choice of license, a | ||
| # recipient has the option to distribute your version of this file under | ||
| # either the CDDL, the GPL Version 2 or to extend the choice of license to | ||
| # its licensees as provided above. However, if you add GPL Version 2 code | ||
| # and therefore, elected the GPL Version 2 license, then the option applies | ||
| # only if the new code is made subject to such option by the copyright | ||
| # holder. | ||
|
|
||
|
|
||
| import imp | ||
|
|
||
| conf = imp.load_source("pkg_conf", "../pkg_conf.py") | ||
|
|
||
| pkg = { | ||
| "name" : "yubikey-authentication", | ||
| "version" : conf.glassfish_version, | ||
| "attributes" : { | ||
| "pkg.summary" : "yubikey-authentication Integration", | ||
| "pkg.description" : "Payara yubikey-authentication modules", | ||
| "info.classification" : "OSGi Service Platform Release 4", | ||
| }, | ||
| "dirtrees" : { "glassfish/modules" : {}, | ||
| }, | ||
| "licenses" : { | ||
| "../../../../ApacheLicense.txt" : {"license" : "ApacheV2"}, | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copyright needs updating in this file