Skip to content

Commit 7267ca1

Browse files
committed
mod_auth_gssapi: Add support for GssapiBasicAuth.
This adds support for the GssapiBasicAuth setting which allows to fall back to basic auth if NEGOTIATE fails.
1 parent 143ffaf commit 7267ca1

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

manifests/vhost.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,6 +1509,7 @@
15091509
# directories => [
15101510
# { path => '/path/to/different/dir',
15111511
# gssapi => {
1512+
# basicauth => 'On',
15121513
# credstore => 'keytab:/foo/bar.keytab',
15131514
# localname => 'Off',
15141515
# sslonly => 'On',

spec/defines/vhost_spec.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@
252252
'passenger_app_log_file' => '/tmp/app.log',
253253
'passenger_debugger' => false,
254254
'gssapi' => {
255+
'basicauth' => 'On',
255256
'credstore' => 'keytab:/foo/bar.keytab',
256257
'localname' => 'On',
257258
'sslonly' => 'Off',
@@ -943,6 +944,11 @@
943944
content: %r{^\s+PassengerDebugger\sOff$},
944945
)
945946
}
947+
it {
948+
is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
949+
content: %r{^\s+GssapiBasicAuth\sOn$},
950+
)
951+
}
946952
it {
947953
is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
948954
content: %r{^\s+GssapiCredStore\skeytab:/foo/bar.keytab$},

templates/vhost/_gssapi.epp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<%|
22
# https://github.com/gssapi/mod_auth_gssapi
3+
Optional[Enum['On','Off']] $basicauth = undef,
34
Optional[String[1]] $credstore = undef,
45
Optional[Enum['On','Off']] $sslonly = undef,
56
Optional[Enum['On','Off']] $localname = undef,
67
|%>
78
# mod_auth_gssapi configuration
9+
<% if $basicauth { -%>
10+
GssapiBasicAuth <%= $basicauth %>
11+
<% } -%>
812
<% if $sslonly { -%>
913
GssapiSSLonly <%= $sslonly %>
1014
<% } -%>

0 commit comments

Comments
 (0)