<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13920] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13920">13920</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-08-27 10:15:01 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>"type" -> "serviceType"</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavauthkerbpy">CalendarServer/trunk/twistedcaldav/authkerb.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (13919 => 13920)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2014-08-26 20:03:59 UTC (rev 13919)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2014-08-27 17:15:01 UTC (rev 13920)
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> principal = schemeConfig["ServicePrincipal"]
</span><span class="cx"> if not principal:
</span><span class="cx"> credFactory = NegotiateCredentialFactory(
</span><del>- type="HTTP",
</del><ins>+ serviceType="HTTP",
</ins><span class="cx"> hostname=config.ServerHostName,
</span><span class="cx"> )
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavauthkerbpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/authkerb.py (13919 => 13920)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/authkerb.py 2014-08-26 20:03:59 UTC (rev 13919)
+++ CalendarServer/trunk/twistedcaldav/authkerb.py 2014-08-27 17:15:01 UTC (rev 13920)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class KerberosCredentialFactoryBase(object):
</span><span class="cx"> """
</span><span class="cx"> Code common to Kerberos-based credential factories.
</span><span class="lines">@@ -56,26 +57,26 @@
</span><span class="cx">
</span><span class="cx"> implements(ICredentialFactory)
</span><span class="cx">
</span><del>- def __init__(self, principal=None, type=None, hostname=None):
</del><ins>+ def __init__(self, principal=None, serviceType=None, hostname=None):
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> @param principal: full Kerberos principal (e.g., 'HTTP/server.example.com@EXAMPLE.COM'). If C{None}
</span><span class="cx"> then the type and hostname arguments are used instead.
</span><del>- @type service: str
- @param type: service type for Kerberos (e.g., 'HTTP'). Must be C{None} if principal used.
- @type type: str
</del><ins>+ @type principal: str
+ @param serviceType: service type for Kerberos (e.g., 'HTTP'). Must be C{None} if principal used.
+ @type serviceType: str
</ins><span class="cx"> @param hostname: hostname for this server. Must be C{None} if principal used.
</span><span class="cx"> @type hostname: str
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # Only certain combinations of arguments allowed
</span><del>- assert (principal and not type and not hostname) or (not principal and type and hostname)
</del><ins>+ assert (principal and not serviceType and not hostname) or (not principal and serviceType and hostname)
</ins><span class="cx">
</span><span class="cx"> if not principal:
</span><span class="cx"> # Look up the Kerberos principal given the service type and hostname, and extract
</span><span class="cx"> # the realm and a service principal value for later use.
</span><span class="cx"> try:
</span><del>- principal = kerberos.getServerPrincipalDetails(type, hostname)
</del><ins>+ principal = kerberos.getServerPrincipalDetails(serviceType, hostname)
</ins><span class="cx"> except kerberos.KrbError, ex:
</span><span class="cx"> self.log.error("getServerPrincipalDetails: %s" % (ex[0],))
</span><span class="cx"> raise ValueError('Authentication System Failure: %s' % (ex[0],))
</span><span class="lines">@@ -137,26 +138,26 @@
</span><span class="cx">
</span><span class="cx"> scheme = 'basic'
</span><span class="cx">
</span><del>- def __init__(self, principal=None, type=None, hostname=None):
</del><ins>+ def __init__(self, principal=None, serviceType=None, hostname=None):
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> @param principal: full Kerberos principal (e.g., 'HTTP/server.example.com@EXAMPLE.COM'). If C{None}
</span><span class="cx"> then the type and hostname arguments are used instead.
</span><del>- @type service: str
- @param type: service type for Kerberos (e.g., 'HTTP'). Must be C{None} if principal used.
- @type type: str
</del><ins>+ @type principal: str
+ @param serviceType: service type for Kerberos (e.g., 'HTTP'). Must be C{None} if principal used.
+ @type serviceType: str
</ins><span class="cx"> @param hostname: hostname for this server. Must be C{None} if principal used.
</span><span class="cx"> @type hostname: str
</span><span class="cx"> """
</span><span class="cx">
</span><del>- super(BasicKerberosCredentialFactory, self).__init__(principal, type, hostname)
</del><ins>+ super(BasicKerberosCredentialFactory, self).__init__(principal, serviceType, hostname)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def getChallenge(self, _ignore_peer):
</span><span class="cx"> return succeed({'realm': self.realm})
</span><span class="cx">
</span><span class="cx">
</span><del>- def decode(self, response, request): #@UnusedVariable
</del><ins>+ def decode(self, response, request): # @UnusedVariable
</ins><span class="cx"> try:
</span><span class="cx"> creds = (response + '===').decode('base64')
</span><span class="cx"> except:
</span><span class="lines">@@ -220,19 +221,19 @@
</span><span class="cx">
</span><span class="cx"> scheme = 'negotiate'
</span><span class="cx">
</span><del>- def __init__(self, principal=None, type=None, hostname=None):
</del><ins>+ def __init__(self, principal=None, serviceType=None, hostname=None):
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> @param principal: full Kerberos principal (e.g., 'HTTP/server.example.com@EXAMPLE.COM'). If C{None}
</span><span class="cx"> then the type and hostname arguments are used instead.
</span><del>- @type service: str
- @param type: service type for Kerberos (e.g., 'HTTP'). Must be C{None} if principal used.
- @type type: str
</del><ins>+ @type principal: str
+ @param serviceType: service type for Kerberos (e.g., 'HTTP'). Must be C{None} if principal used.
+ @type serviceType: str
</ins><span class="cx"> @param hostname: hostname for this server. Must be C{None} if principal used.
</span><span class="cx"> @type hostname: str
</span><span class="cx"> """
</span><span class="cx">
</span><del>- super(NegotiateCredentialFactory, self).__init__(principal, type, hostname)
</del><ins>+ super(NegotiateCredentialFactory, self).__init__(principal, serviceType, hostname)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def getChallenge(self, _ignore_peer):
</span><span class="lines">@@ -301,7 +302,7 @@
</span><span class="cx">
</span><span class="cx"> wwwauth = '%s %s' % (self.scheme, response)
</span><span class="cx">
</span><del>- def responseFilterAddWWWAuthenticate(request, response): #@UnusedVariable
</del><ins>+ def responseFilterAddWWWAuthenticate(request, response): # @UnusedVariable
</ins><span class="cx"> if response.code != responsecode.UNAUTHORIZED:
</span><span class="cx"> response.headers.addRawHeader('www-authenticate', wwwauth)
</span><span class="cx"> return response
</span></span></pre>
</div>
</div>
</body>
</html>