Keyfactor · 3keyroman · Feb 22, 2023 · Feb 23, 2023 · Feb 23, 2023 · Feb 24, 2023
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,45 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the Bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected Behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Screenshots and Logs**
+
+If applicable, add screenshots and logs to help explain your problem.
+
+**Product Deployment** 
+
+Please complete the following information:
+ - Deployment format: [e.g. software, container]
+ - Version [e.g. 8.0.0]
+
+**Desktop**
+
+Please complete the following information:
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional Context**
+
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: GitHub Discussions
+    url: https://github.com/Keyfactor/signserver-ce/discussions
+    about: Join in-depth discussions or ask questions
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem or specific use case? Please describe.**
+A clear and concise description of the problem or use case. 
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Product deployment**
+Please complete the following information:
+ - Deployment format: [e.g. software, container]
+ - Version [e.g. 8.0.0]
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,41 @@
+# SignServer Contributing Guidelines <!-- omit in toc -->
+
+Thank you for contributing to SignServer!
+
+In this guide, you get an overview of the contribution workflow from starting a discussion or opening an issue, to creating, reviewing, and merging a pull request.
+
+For an overview of the project, see [README](README.md). 
+
+### Start a discussion
+If you have a question or problem, you can [search in discussions](../../discussions), if someone has already found a solution to your problem. 
+
+Or you can [start a new discussion](../../discussions/new/choose) and ask your question. 
+
+### Create an issue
+
+If you find a problem with SignServer, [search if an issue already exists](../../issues).
+
+If a related discussion or issue doesn't exist, you can [open a new issue](../../issues/new). An issue can be converted into a discussion if regarded as one.
+
+### Contribute to the code
+
+#### Create a pull request
+
+You are welcome to send patches, under the LGPLv2.1+ license, as pull requests. For more information, see [Creating a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). For minor updates, you can instead choose to create an issue with short snippets of code. See above.
+
+* Create a JUnit test case for your change, it may be a simple addition to an existing test. If you do not know how to do this, ask us and we will help you. 
+* If you run into any merge issues, check out this [git tutorial](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues.
+
+For instructions on building and developing SignServer, refer to the SignServer documentation on [Developer Reference](https://doc.primekey.com/signserver/signserver-reference/developer-reference).
+
+#### Self-review
+
+Don't forget to self-review. Please follow these simple guidelines:
+* Keep the patch limited, only change the parts related to your patch. 
+* Do not change other lines, such as whitespace, adding line breaks to Java doc, etc. It will make it very hard for us to review the patch.
+
+#### Your pull request is merged
+
+For acceptance, pull requests need to meet specific quality criteria, including tests for anything substantial. Someone on the SignServer core team will review the pull request when there is time, and let you know if something is missing or suggest improvements. If it is a useful and generic feature it will be integrated in SignServer to be available in a later release.
+
+For substantial, non-trivial contributions, you will be asked to sign a contributor assignment agreement. Optionally, you can also have your name and contact information listed on the [Contributors](https://www.signserver.org/contributors/) page. 
diff --git a/README.md b/README.md
@@ -19,14 +19,14 @@ You can also easily run SignServer as a container from **[Docker Hub](https://hu
 In our Community we welcome contributions. The Community software is open source and community supported, there is no support SLA, but a helpful best-effort Community.
 
 * To report a problem or suggest a new feature, use the **[Issues](../../issues)** tab. 
-* If you want to contribute actual bug fixes or proposed enhancements, use the **[Pull requests](../../pulls)** tab.
+* If you want to contribute to the project, see our **[Contributing guidelines](CONTRIBUTING.md)**.
 * Ask the community for ideas: **[SignServer Discussions](https://github.com/Keyfactor/signserver-ce/discussions)**.  
 * Read more in our documentation: **[SignServer Documentation](https://doc.primekey.com/signserver)**.
 * See release information: **[SignServer Release Information](https://doc.primekey.com/signserver/signserver-release-information)**. 
 * Read more on the open source project website: **[SignServer website](https://www.signserver.org/)**.   
 
 ## Commercial Support
-Commercial support is available for **[SignServer Enterprise](https://www.primekey.com/products/signserver-enterprise/)**.
+Commercial support is available for **[SignServer Enterprise](https://www.keyfactor.com/products/signserver-enterprise/)**.
 
 ## License
 SignServer Community is licensed under the LGPL license, please see **[LICENSE](LICENSE)**. 

diff --git a/SECURITY.md b/SECURITY.md
@@ -1,8 +1,14 @@
 # Security Policy
 
 ## Reporting a Vulnerability
+If you think that you have found a security vulnerability, please report it to this email address: [security@primekey.com](mailto:security@primekey.com)
 
-If you think that you have found a security vulnerability in SignServer, please report it to this email address:
-security@primekey.com
+Describe the issue including all details, for example: 
+* Short summary of the problem
+* Steps to reproduce
+* Affected product versions
+* Logs if available 
 
-If you want to encrypt email traffic, see the keys page on https://www.signserver.org/signserver-keys/ for our PGP key.
+The Keyfactor team will send a response indicating the next steps in handling your report. You may be asked to provide additional information or guidance. 
+
+If the issue is confirmed as a vulnerability, we will open a Security Advisory and acknowledge your contributions as part of it. Optionally, you can have your name and contact information listed on the [Contributors](https://www.signserver.org/contributors/) page. 
diff --git a/signserver/.gitignore b/signserver/.gitignore
@@ -62,8 +62,6 @@ dist-*/
 /bin/sntp-tool
 /bin/sntp-tool.cmd
 /bin/timemonitor-in-background.sh
-/bin/signserver-gui
-/bin/signserver-gui.cmd
 
 /conf/signserver_deploy.properties
 /conf/signserver_cli.properties
@@ -73,7 +71,6 @@ dist-*/
 /conf/cesecore.properties
 /conf/timemonitor-log4j.properties
 /conf/signserver_build.properties
-/conf/admingui.properties
 /conf/timemonitor-log4j2.properties
 
 # Enterprise Edition sample configuration files
@@ -103,6 +100,7 @@ dist-*/
 /doc/sample-configs/apk_*.properties
 /doc/sample-configs/qos_*.properties
 /doc/sample-configs/ades.properties
+/doc/sample-configs/fortanix-*
 
 /indir*/
 /jarsigner-test-files/
@@ -126,10 +124,11 @@ dist-*/
 /lib/ext/apksig-*
 /lib/ext/jdbc/*.jar
 /lib/ext/dss-*
-/lib/ext/commons-lang3-*
 /lib/ext/commons-net-*
 /lib/ext/specs-*
 /lib/ext/validation-*
+/lib/ext/p11ng-*
+/lib/maven-install-files-ee.sh
 
 /modules/SignServer-Admin-web/nbproject
 /modules/SignServer-AdminCLI/nbproject
@@ -143,8 +142,6 @@ dist-*/
 /modules/SignServer-Test-System/src/jndi.properties
 /modules/SignServer-Test-System/src/test/java/org/signserver/client/api/EightCA-use.crl
 /modules/SignServer-ejb/.ant-targets-build.xml
-/modules/mod-enterprise/SignServer-AdminGUI/connect.properties
-/modules/mod-enterprise/SignServer-AdminGUI/.~lock.admingui-splash.odg*
 /modules/mod-enterprise/SignServer-Module-TimeMonitorManager/.jacocoverage
 /modules/mod-enterprise/SignServer-Test-Enterprise/nbproject
 /modules/mod-enterprise/SignServer-TimeMonitor/.jacocoverage

diff --git a/signserver/bin/signclient b/signserver/bin/signclient
@@ -97,8 +97,8 @@ fi
 
 # In some cases, running SignClient authenticating with a P11 token
 # (e.g. a smartcard reader) could give cipher-suit errors,
-# In these cases, a workaround is to force the use of TLS version 1.1
-#JAVA_OPTS="$JAVA_OPTS  -Djdk.tls.client.protocols=TLSv1.1 -Dhttps.protocols=TLSv1.1"
+# In these cases, a workaround is to force the use of TLS version 1.2
+#JAVA_OPTS="$JAVA_OPTS  -Djdk.tls.client.protocols=TLSv1.2 -Dhttps.protocols=TLSv1.2"
 
 # Enable Java debugging
 #JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8788,server=y,suspend=n"