[Rt-commit] [svn] r883 - in RTx-Atom: . html/Atom/0.3 html/Atom/0.3/Elements

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Wed May 12 22:11:43 2004
New Revision: 883

Modified:
   RTx-Atom/   (props changed)
   RTx-Atom/html/Atom/0.3/Elements/Introspect
   RTx-Atom/html/Atom/0.3/dhandler
   RTx-Atom/html/Atom/0.3/index
Log:
 ----------------------------------------------------------------------
 r4828 at not:  autrijus | 2004-05-13T02:11:33.910264Z
 
 * backport to 3.0.x.
 ----------------------------------------------------------------------


Modified: RTx-Atom/html/Atom/0.3/Elements/Introspect
==============================================================================
--- RTx-Atom/html/Atom/0.3/Elements/Introspect	(original)
+++ RTx-Atom/html/Atom/0.3/Elements/Introspect	Wed May 12 22:11:43 2004
@@ -36,6 +36,8 @@
     $gone{$type}++ if $score > 1;
 }
 
+delete $gone{'Tickets'}; # XXX
+
 delete @collection_to_class{keys %gone};
 return \%collection_to_class if $Want eq 'CollectionToClass';
 return \%record_to_collection if $Want eq 'RecordToCollection';

Modified: RTx-Atom/html/Atom/0.3/dhandler
==============================================================================
--- RTx-Atom/html/Atom/0.3/dhandler	(original)
+++ RTx-Atom/html/Atom/0.3/dhandler	Wed May 12 22:11:43 2004
@@ -2,6 +2,7 @@
 <%INIT>
 require XML::Simple;
 require Digest::MD5;
+require Digest::SHA1;
 require MIME::Base64;
 
 # needs discussion on using MD5(pass) as Digest token
@@ -142,9 +143,19 @@
     #	last; # system clock differ by more than one day, oops!
     # }
 
-    $CurrentUser->Authenticate(
-	$auth_digest, $auth_created, $auth_nonce, $realm
-    ) or (undef($CurrentUser), last);
+    my $server_pass = $CurrentUser->UserObj->__Value('Password');
+    my $my_digest = MIME::Base64::encode_base64(Digest::SHA1::sha1(
+	$auth_nonce .
+	$auth_created .
+	Digest::MD5::md5_hex("$username:$realm:$server_pass")
+    ));
+
+    chomp($auth_digest);
+    chomp($my_digest);
+    if ($auth_digest ne $my_digest) {
+	undef $CurrentUser;
+	last;
+    }
 
     # remember issued nonces
     $nonce_cache->set( $auth_nonce, 1 );

Modified: RTx-Atom/html/Atom/0.3/index
==============================================================================
--- RTx-Atom/html/Atom/0.3/index	(original)
+++ RTx-Atom/html/Atom/0.3/index	Wed May 12 22:11:43 2004
@@ -18,7 +18,7 @@
     <& $ShowLink, Relation => "service.feed", URI => "$BaseURI/$class?", Title => $type, IsChild => 1 &>
     <& $ShowLink, Relation => 'service.post', URI => "$BaseURI/$class", Id => $type, Title => $type &>
     <& $ShowLink, Type => "text/html", URI => $BaseURI, Title => $type &>
-    <id><% $RT::SystemUser->UserObj->URI %>/<% $class %></id>
+%#  <id><% $RT::SystemUser->UserObj->URI %>/<% $class %></id>
     <issued><% $RT::SystemUser->UserObj->CreatedObj->W3CDTF %></issued>
     <modified><% $Now->W3CDTF %></modified>
   </entry>