<!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>[5541] CalDAVClientLibrary/trunk/src</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.macosforge.org/projects/calendarserver/changeset/5541">5541</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2010-04-28 11:52:45 -0700 (Wed, 28 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add new command for changing the user/pswd during a session.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunksrcbrowsercommands__init__py">CalDAVClientLibrary/trunk/src/browser/commands/__init__.py</a></li>
<li><a href="#CalDAVClientLibrarytrunksrcbrowsershellpy">CalDAVClientLibrary/trunk/src/browser/shell.py</a></li>
<li><a href="#CalDAVClientLibrarytrunksrcclientaccountpy">CalDAVClientLibrary/trunk/src/client/account.py</a></li>
<li><a href="#CalDAVClientLibrarytrunksrcclientclientsessionpy">CalDAVClientLibrary/trunk/src/client/clientsession.py</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunksrcbrowsercommandsuserpy">CalDAVClientLibrary/trunk/src/browser/commands/user.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVClientLibrarytrunksrcbrowsercommands__init__py"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/src/browser/commands/__init__.py (5540 => 5541)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/src/browser/commands/__init__.py        2010-04-28 16:24:17 UTC (rev 5540)
+++ CalDAVClientLibrary/trunk/src/browser/commands/__init__.py        2010-04-28 18:52:45 UTC (rev 5541)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2007-2008 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2007-2010 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="lines">@@ -32,5 +32,6 @@
</span><span class="cx">     &quot;quit&quot;,
</span><span class="cx">     &quot;rm&quot;,
</span><span class="cx">     &quot;server&quot;,
</span><ins>+    &quot;user&quot;,
</ins><span class="cx">     &quot;whoami&quot;,
</span><span class="cx"> ]
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunksrcbrowsercommandsuserpy"></a>
<div class="addfile"><h4>Added: CalDAVClientLibrary/trunk/src/browser/commands/user.py (0 => 5541)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/src/browser/commands/user.py                                (rev 0)
+++ CalDAVClientLibrary/trunk/src/browser/commands/user.py        2010-04-28 18:52:45 UTC (rev 5541)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+##
+# Copyright (c) 2007-2010 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from browser.command import Command
+from browser.command import WrongOptions
+from getpass import getpass
+
+class Cmd(Command):
+    
+    def __init__(self):
+        super(Command, self).__init__()
+        self.cmds = (&quot;user&quot;, )
+        
+    def execute(self, name, options):
+        if options:
+            print self.usage(name)
+            raise WrongOptions()
+        user = raw_input(&quot;New User: &quot;)
+        pswd = getpass(&quot;New Password: &quot;)
+        self.shell.setUserPswd(user, pswd)
+        return True
+
+    def usage(self, name):
+        return &quot;&quot;&quot;Usage: %s
+&quot;&quot;&quot; % (name,)
+
+    def helpDescription(self):
+        return &quot;Allows chnaging the current server login id and password.&quot;
</ins></span></pre></div>
<a id="CalDAVClientLibrarytrunksrcbrowsershellpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/src/browser/shell.py (5540 => 5541)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/src/browser/shell.py        2010-04-28 16:24:17 UTC (rev 5540)
+++ CalDAVClientLibrary/trunk/src/browser/shell.py        2010-04-28 18:52:45 UTC (rev 5541)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2007-2008 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2007-2010 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="lines">@@ -61,6 +61,12 @@
</span><span class="cx">         self.prefix = self.wd = newwd
</span><span class="cx">         return True
</span><span class="cx"> 
</span><ins>+    def setUserPswd(self, user, pswd):
+        
+        self.user = user
+        self.pswd = pswd
+        self.account.setUserPswd(user, pswd)
+
</ins><span class="cx"> def usage():
</span><span class="cx">     return &quot;&quot;&quot;Usage: shell [OPTIONS]
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunksrcclientaccountpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/src/client/account.py (5540 => 5541)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/src/client/account.py        2010-04-28 16:24:17 UTC (rev 5540)
+++ CalDAVClientLibrary/trunk/src/client/account.py        2010-04-28 18:52:45 UTC (rev 5541)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2006-2007 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2006-2010 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="lines">@@ -23,6 +23,10 @@
</span><span class="cx">         self.session = CalDAVSession(server, port, ssl, user, pswd, principal, root, logging)
</span><span class="cx">         self.principal = principalCache.getPrincipal(self.session, self.session.principalPath)
</span><span class="cx">     
</span><ins>+    def setUserPswd(self, user, pswd):
+        
+        self.session.setUserPswd(user, pswd)
+
</ins><span class="cx">     def getPrincipal(self, path=None, refresh=False):
</span><span class="cx">         if path:
</span><span class="cx">             return principalCache.getPrincipal(self.session, path, refresh=refresh)
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunksrcclientclientsessionpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/src/client/clientsession.py (5540 => 5541)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/src/client/clientsession.py        2010-04-28 16:24:17 UTC (rev 5540)
+++ CalDAVClientLibrary/trunk/src/client/clientsession.py        2010-04-28 18:52:45 UTC (rev 5541)
</span><span class="lines">@@ -89,6 +89,12 @@
</span><span class="cx">                     self.log.write(&quot;Found principal path: %s&quot; % (self.principalPath.absoluteURL(),))
</span><span class="cx">                 return
</span><span class="cx">     
</span><ins>+    def setUserPswd(self, user, pswd):
+        
+        self.user = user
+        self.pswd = pswd
+        self.authorization = None
+
</ins><span class="cx">     def testResource(self, rurl):
</span><span class="cx"> 
</span><span class="cx">         assert(isinstance(rurl, URL))
</span></span></pre>
</div>
</div>

</body>
</html>