-
Notifications
You must be signed in to change notification settings - Fork 492
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Shib: use port 8181 for Shib page and plumbing #2117
Apache and mod_shib once ran on port 443 but we decided to let Glassfish serve HTTPS requests there instead. Apache is still serving HTTP on port 80 but is now serving HTTPS on port 8181 to the code and configuration has been changed to accomodate this. Configuration file examples are from http://shibtest.dataverse.org with comments. The idea is that the only time users see port 8181 in their browsers is when they are on https://shibtest.dataverse.org:8181/shib.xhtml when creating or converting an account after having authenticated with their institution. Behind the scenes, other "plumbing" under "/Shibboleth.sso" is available for metadata exchange and determining users' affiliation. A todo has been added to make this port configurable from 8181. Note that a servlet filter has been added because the same origin policy was preventing resources from being read, which resulted in an ugly page with missing images. Finally, more information has been added when testing with TestShib to not worry about the lack of the "mail" attribute.
- Loading branch information
Showing
9 changed files
with
564 additions
and
4 deletions.
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
scripts/deploy/shibtest.dataverse.org/etc/httpd/conf.d/shibtest.dataverse.org.conf
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,19 @@ | ||
<VirtualHost *:80> | ||
|
||
ServerName shibtest.dataverse.org | ||
|
||
# From https://wiki.apache.org/httpd/RewriteHTTPToHTTPS | ||
|
||
RewriteEngine On | ||
# This will enable the Rewrite capabilities | ||
|
||
RewriteCond %{HTTPS} !=on | ||
# This checks to make sure the connection is not already HTTPS | ||
|
||
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] | ||
# This rule will redirect users from their original location, to the same location but using HTTPS. | ||
# i.e. http://www.example.com/foo/ to https://www.example.com/foo/ | ||
# The leading slash is made optional so that this will work either in httpd.conf | ||
# or .htaccess context | ||
|
||
</VirtualHost> |
250 changes: 250 additions & 0 deletions
250
scripts/deploy/shibtest.dataverse.org/etc/httpd/conf.d/ssl.conf
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,250 @@ | ||
# | ||
# This is the Apache server configuration file providing SSL support. | ||
# It contains the configuration directives to instruct the server how to | ||
# serve pages over an https connection. For detailing information about these | ||
# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html> | ||
# | ||
# Do NOT simply read the instructions in here without understanding | ||
# what they do. They're here only as hints or reminders. If you are unsure | ||
# consult the online docs. You have been warned. | ||
# | ||
|
||
LoadModule ssl_module modules/mod_ssl.so | ||
|
||
# | ||
# When we also provide SSL we have to listen to the | ||
# the HTTPS port in addition. | ||
# | ||
#Listen 443 | ||
Listen 8181 | ||
|
||
## | ||
## SSL Global Context | ||
## | ||
## All SSL configuration in this context applies both to | ||
## the main server and all SSL-enabled virtual hosts. | ||
## | ||
|
||
# Pass Phrase Dialog: | ||
# Configure the pass phrase gathering process. | ||
# The filtering dialog program (`builtin' is a internal | ||
# terminal dialog) has to provide the pass phrase on stdout. | ||
SSLPassPhraseDialog builtin | ||
|
||
# Inter-Process Session Cache: | ||
# Configure the SSL Session Cache: First the mechanism | ||
# to use and second the expiring timeout (in seconds). | ||
SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000) | ||
SSLSessionCacheTimeout 300 | ||
|
||
# Semaphore: | ||
# Configure the path to the mutual exclusion semaphore the | ||
# SSL engine uses internally for inter-process synchronization. | ||
SSLMutex default | ||
|
||
# Pseudo Random Number Generator (PRNG): | ||
# Configure one or more sources to seed the PRNG of the | ||
# SSL library. The seed data should be of good random quality. | ||
# WARNING! On some platforms /dev/random blocks if not enough entropy | ||
# is available. This means you then cannot use the /dev/random device | ||
# because it would lead to very long connection times (as long as | ||
# it requires to make more entropy available). But usually those | ||
# platforms additionally provide a /dev/urandom device which doesn't | ||
# block. So, if available, use this one instead. Read the mod_ssl User | ||
# Manual for more details. | ||
SSLRandomSeed startup file:/dev/urandom 256 | ||
SSLRandomSeed connect builtin | ||
#SSLRandomSeed startup file:/dev/random 512 | ||
#SSLRandomSeed connect file:/dev/random 512 | ||
#SSLRandomSeed connect file:/dev/urandom 512 | ||
|
||
# | ||
# Use "SSLCryptoDevice" to enable any supported hardware | ||
# accelerators. Use "openssl engine -v" to list supported | ||
# engine names. NOTE: If you enable an accelerator and the | ||
# server does not start, consult the error logs and ensure | ||
# your accelerator is functioning properly. | ||
# | ||
SSLCryptoDevice builtin | ||
#SSLCryptoDevice ubsec | ||
|
||
## | ||
## SSL Virtual Host Context | ||
## | ||
|
||
#<VirtualHost _default_:443> | ||
<VirtualHost _default_:8181> | ||
|
||
# General setup for the virtual host, inherited from global configuration | ||
#DocumentRoot "/var/www/html" | ||
#ServerName shibtest.dataverse.org:443 | ||
ServerName shibtest.dataverse.org:8181 | ||
|
||
# Use separate log files for the SSL virtual host; note that LogLevel | ||
# is not inherited from httpd.conf. | ||
ErrorLog logs/ssl_error_log | ||
TransferLog logs/ssl_access_log | ||
LogLevel warn | ||
|
||
# SSL Engine Switch: | ||
# Enable/Disable SSL for this virtual host. | ||
SSLEngine on | ||
|
||
# SSL Protocol support: | ||
# List the enable protocol levels with which clients will be able to | ||
# connect. Disable SSLv2 access by default: | ||
SSLProtocol all -SSLv2 | ||
|
||
# SSL Cipher Suite: | ||
# List the ciphers that the client is permitted to negotiate. | ||
# See the mod_ssl documentation for a complete list. | ||
SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW | ||
|
||
# Server Certificate: | ||
# Point SSLCertificateFile at a PEM encoded certificate. If | ||
# the certificate is encrypted, then you will be prompted for a | ||
# pass phrase. Note that a kill -HUP will prompt again. A new | ||
# certificate can be generated using the genkey(1) command. | ||
SSLCertificateFile /etc/pki/tls/certs/shibtest.dataverse.org.crt | ||
|
||
# Server Private Key: | ||
# If the key is not combined with the certificate, use this | ||
# directive to point at the key file. Keep in mind that if | ||
# you've both a RSA and a DSA private key you can configure | ||
# both in parallel (to also allow the use of DSA ciphers, etc.) | ||
SSLCertificateKeyFile /etc/pki/tls/private/shibtest.dataverse.org.key | ||
|
||
# Server Certificate Chain: | ||
# Point SSLCertificateChainFile at a file containing the | ||
# concatenation of PEM encoded CA certificates which form the | ||
# certificate chain for the server certificate. Alternatively | ||
# the referenced file can be the same as SSLCertificateFile | ||
# when the CA certificates are directly appended to the server | ||
# certificate for convinience. | ||
SSLCertificateChainFile /etc/pki/tls/certs/shibtest.dataverse.org_server-chain.crt | ||
|
||
# Certificate Authority (CA): | ||
# Set the CA certificate verification path where to find CA | ||
# certificates for client authentication or alternatively one | ||
# huge file containing all of them (file must be PEM encoded) | ||
#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt | ||
|
||
# Client Authentication (Type): | ||
# Client certificate verification type and depth. Types are | ||
# none, optional, require and optional_no_ca. Depth is a | ||
# number which specifies how deeply to verify the certificate | ||
# issuer chain before deciding the certificate is not valid. | ||
#SSLVerifyClient require | ||
#SSLVerifyDepth 10 | ||
|
||
# Access Control: | ||
# With SSLRequire you can do per-directory access control based | ||
# on arbitrary complex boolean expressions containing server | ||
# variable checks and other lookup directives. The syntax is a | ||
# mixture between C and Perl. See the mod_ssl documentation | ||
# for more details. | ||
#<Location /> | ||
#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ | ||
# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ | ||
# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ | ||
# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ | ||
# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ | ||
# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ | ||
#</Location> | ||
|
||
# SSL Engine Options: | ||
# Set various options for the SSL engine. | ||
# o FakeBasicAuth: | ||
# Translate the client X.509 into a Basic Authorisation. This means that | ||
# the standard Auth/DBMAuth methods can be used for access control. The | ||
# user name is the `one line' version of the client's X.509 certificate. | ||
# Note that no password is obtained from the user. Every entry in the user | ||
# file needs this password: `xxj31ZMTZzkVA'. | ||
# o ExportCertData: | ||
# This exports two additional environment variables: SSL_CLIENT_CERT and | ||
# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the | ||
# server (always existing) and the client (only existing when client | ||
# authentication is used). This can be used to import the certificates | ||
# into CGI scripts. | ||
# o StdEnvVars: | ||
# This exports the standard SSL/TLS related `SSL_*' environment variables. | ||
# Per default this exportation is switched off for performance reasons, | ||
# because the extraction step is an expensive operation and is usually | ||
# useless for serving static content. So one usually enables the | ||
# exportation for CGI and SSI requests only. | ||
# o StrictRequire: | ||
# This denies access when "SSLRequireSSL" or "SSLRequire" applied even | ||
# under a "Satisfy any" situation, i.e. when it applies access is denied | ||
# and no other module can change it. | ||
# o OptRenegotiate: | ||
# This enables optimized SSL connection renegotiation handling when SSL | ||
# directives are used in per-directory context. | ||
#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire | ||
<Files ~ "\.(cgi|shtml|phtml|php3?)$"> | ||
SSLOptions +StdEnvVars | ||
</Files> | ||
<Directory "/var/www/cgi-bin"> | ||
SSLOptions +StdEnvVars | ||
</Directory> | ||
|
||
# SSL Protocol Adjustments: | ||
# The safe and default but still SSL/TLS standard compliant shutdown | ||
# approach is that mod_ssl sends the close notify alert but doesn't wait for | ||
# the close notify alert from client. When you need a different shutdown | ||
# approach you can use one of the following variables: | ||
# o ssl-unclean-shutdown: | ||
# This forces an unclean shutdown when the connection is closed, i.e. no | ||
# SSL close notify alert is send or allowed to received. This violates | ||
# the SSL/TLS standard but is needed for some brain-dead browsers. Use | ||
# this when you receive I/O errors because of the standard approach where | ||
# mod_ssl sends the close notify alert. | ||
# o ssl-accurate-shutdown: | ||
# This forces an accurate shutdown when the connection is closed, i.e. a | ||
# SSL close notify alert is send and mod_ssl waits for the close notify | ||
# alert of the client. This is 100% SSL/TLS standard compliant, but in | ||
# practice often causes hanging connections with brain-dead browsers. Use | ||
# this only for browsers where you know that their SSL implementation | ||
# works correctly. | ||
# Notice: Most problems of broken clients are also related to the HTTP | ||
# keep-alive facility, so you usually additionally want to disable | ||
# keep-alive for those clients, too. Use variable "nokeepalive" for this. | ||
# Similarly, one has to force some clients to use HTTP/1.0 to workaround | ||
# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and | ||
# "force-response-1.0" for this. | ||
SetEnvIf User-Agent ".*MSIE.*" \ | ||
nokeepalive ssl-unclean-shutdown \ | ||
downgrade-1.0 force-response-1.0 | ||
|
||
# Per-Server Logging: | ||
# The home of a custom SSL log file. Use this when you want a | ||
# compact non-error SSL logfile on a virtual host basis. | ||
CustomLog logs/ssl_request_log \ | ||
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" | ||
|
||
# We set this header to avoid this: | ||
# "Failed to download metadata from :8181/Shibboleth.sso/DiscoFeed" | ||
# Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at https://shibtest.dataverse.org:8181/Shibboleth.sso/DiscoFeed. This can be fixed by moving the resource to the same domain or enabling CORS. | ||
Header set Access-Control-Allow-Origin "*" | ||
|
||
# Rewrite all non-Shib traffic to the standard HTTPS port (443) | ||
# Shib traffic includes: | ||
# - https://shibtest.dataverse.org:8181/Shibboleth.sso/DiscoFeed | ||
# - https://shibtest.dataverse.org:8181/Shibboleth.sso/Metadata | ||
# - https://shibtest.dataverse.org:8181/shib.xhtml (proxied to Glassfish) | ||
# This will allow users to click "Home" (for example) from | ||
# shib.xhtml and *not* stay on port 8181 like this: | ||
# https://shibtest.dataverse.org:8181 | ||
RewriteEngine On | ||
RewriteCond %{REQUEST_URI} !^/(Shibboleth.sso|shib.xhtml) | ||
RewriteRule /?(.*) https://%{SERVER_NAME}/$1 [R,L] | ||
|
||
ProxyPass /shib.xhtml ajp://localhost:8009/shib.xhtml | ||
|
||
<Location /shib.xhtml> | ||
AuthType shibboleth | ||
ShibRequestSetting requireSession 1 | ||
require valid-user | ||
</Location> | ||
|
||
</VirtualHost> | ||
|
Oops, something went wrong.