X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FTutorial%2F05_Authentication.pod;h=b01f4464dff0ebd483b527f9d655ccf099be4e2c;hb=8fefbef869d13800721f91ef15229da60889d12d;hp=dc6e2bdd0d7cd9532843321b851c34295277b56b;hpb=3c700304aa69d7d4744523fa1f264a2e07c4315c;p=catagits%2FCatalyst-Manual.git

diff --git a/lib/Catalyst/Manual/Tutorial/05_Authentication.pod b/lib/Catalyst/Manual/Tutorial/05_Authentication.pod
index dc6e2bd..b01f446 100644
--- a/lib/Catalyst/Manual/Tutorial/05_Authentication.pod
+++ b/lib/Catalyst/Manual/Tutorial/05_Authentication.pod
@@ -58,14 +58,14 @@ L<Appendices|Catalyst::Manual::Tutorial::10_Appendices>
 
 Now that we finally have a simple yet functional application, we can
 focus on providing authentication (with authorization coming next in
-Chapter 6).
+L<Chapter 6|Catalyst::Manual::Tutorial::06_Authorization>).
 
-This chapter of the tutorial is divided into two main sections: 1) basic,
-cleartext authentication and 2) hash-based authentication.
+This chapter of the tutorial is divided into two main sections: 1)
+basic, cleartext authentication and 2) hash-based authentication.
 
 You can checkout the source code for this example from the catalyst
 subversion repository as per the instructions in
-L<Catalyst::Manual::Tutorial::01_Intro|Catalyst::Manual::Tutorial::01_Intro>.
+L<Catalyst::Manual::Tutorial::01_Intro>.
 
 
 =head1 BASIC AUTHENTICATION
@@ -78,14 +78,14 @@ application.
 
 First, we add both user and role information to the database (we will
 add the role information here although it will not be used until the
-authorization section, Chapter 6).  Create a new SQL script file by opening
-C<myapp02.sql> in your editor and insert:
+authorization section, Chapter 6).  Create a new SQL script file by
+opening C<myapp02.sql> in your editor and insert:
 
     --
-    -- Add user and role tables, along with a many-to-many join table
+    -- Add users and role tables, along with a many-to-many join table
     --
     PRAGMA foreign_keys = ON;
-    CREATE TABLE user (
+    CREATE TABLE users (
             id            INTEGER PRIMARY KEY,
             username      TEXT,
             password      TEXT,
@@ -99,16 +99,16 @@ C<myapp02.sql> in your editor and insert:
             role TEXT
     );
     CREATE TABLE user_role (
-            user_id INTEGER REFERENCES user(id) ON DELETE CASCADE ON UPDATE CASCADE,
+            user_id INTEGER REFERENCES users(id) ON DELETE CASCADE ON UPDATE CASCADE,
             role_id INTEGER REFERENCES role(id) ON DELETE CASCADE ON UPDATE CASCADE,
             PRIMARY KEY (user_id, role_id)
     );
     --
     -- Load up some initial test data
     --
-    INSERT INTO user VALUES (1, 'test01', 'mypass', 't01@na.com', 'Joe',  'Blow', 1);
-    INSERT INTO user VALUES (2, 'test02', 'mypass', 't02@na.com', 'Jane', 'Doe',  1);
-    INSERT INTO user VALUES (3, 'test03', 'mypass', 't03@na.com', 'No',   'Go',   0);
+    INSERT INTO users VALUES (1, 'test01', 'mypass', 't01@na.com', 'Joe',  'Blow', 1);
+    INSERT INTO users VALUES (2, 'test02', 'mypass', 't02@na.com', 'Jane', 'Doe',  1);
+    INSERT INTO users VALUES (3, 'test03', 'mypass', 't03@na.com', 'No',   'Go',   0);
     INSERT INTO role VALUES (1, 'user');
     INSERT INTO role VALUES (2, 'admin');
     INSERT INTO user_role VALUES (1, 1);
@@ -124,8 +124,9 @@ Then load this into the C<myapp.db> database with the following command:
 =head2 Add User and Role Information to DBIC Schema
 
 Although we could manually edit the DBIC schema information to include
-the new tables added in the previous step, let's use the C<create=static>
-option on the DBIC model helper to do most of the work for us:
+the new tables added in the previous step, let's use the
+C<create=static> option on the DBIC model helper to do most of the work
+for us:
 
     $ script/myapp_create.pl model DB DBIC::Schema MyApp::Schema \
         create=static components=TimeStamp dbi:SQLite:myapp.db \
@@ -146,19 +147,18 @@ files, those changes would have only been written above the C<# DO NOT
 MODIFY THIS OR ANYTHING ABOVE!> comment and your hand-edited
 enhancements would have been preserved.
 
-Speaking of "hand-editted enhancements," we should now add the 
-C<many_to_many> relationship information to the User Result Source file. 
-As with the Book, BookAuthor, and Author files in 
-L<Chapter 3|Catalyst::Manual::Tutorial::03_MoreCatalystBasics>, 
-L<DBIx::Class::Schema::Loader|DBIx::Class::Schema::Loader> has 
-automatically created the C<has_many> and C<belongs_to> relationships 
-for the new User, UserRole, and Role tables. However, as a convenience 
-for mapping Users to their assigned roles (see 
-L<Chapter 6|Catalyst::Manual::Tutorial::06_Authorization>), we will 
-also manually add a C<many_to_many> relationship. Edit 
-C<lib/MyApp/Schema/Result/User.pm> add the following information between 
-the C<# DO NOT MODIFY THIS OR ANYTHING ABOVE!> comment and the closing 
-C<1;>: 
+Speaking of "hand-edited enhancements," we should now add the
+C<many_to_many> relationship information to the User Result Source file.
+As with the Book, BookAuthor, and Author files in L<Chapter
+3|Catalyst::Manual::Tutorial::03_MoreCatalystBasics>,
+L<DBIx::Class::Schema::Loader> has automatically created the C<has_many>
+and C<belongs_to> relationships for the new User, UserRole, and Role
+tables. However, as a convenience for mapping Users to their assigned
+roles (see L<Chapter 6|Catalyst::Manual::Tutorial::06_Authorization>),
+we will also manually add a C<many_to_many> relationship. Edit
+C<lib/MyApp/Schema/Result/User.pm> add the following information between
+the C<# DO NOT MODIFY THIS OR ANYTHING ABOVE!> comment and the closing
+C<1;>:
 
     # many_to_many():
     #   args:
@@ -166,31 +166,31 @@ C<1;>:
     #     2) Name of has_many() relationship this many_to_many() is shortcut for
     #     3) Name of belongs_to() relationship in model class of has_many() above
     #   You must already have the has_many() defined to use a many_to_many().
-    __PACKAGE__->many_to_many(roles => 'user_roles', 'role');
+    __PACKAGE__->many_to_many(roles => 'user_roles', 'role_id');
 
-The code for this update is obviously very similar to the edits we made 
-to the C<Book> and C<Author> classes created in Chapter 3 with one 
-exception: we only defined the C<many_to_many> relationship in one 
-direction. Whereas we felt that we would want to map Authors to Books 
-B<AND> Books to Authors, here we are only adding the convenience 
-C<many_to_many> in the Users to Roles direction. 
+The code for this update is obviously very similar to the edits we made
+to the C<Book> and C<Author> classes created in Chapter 3 with one
+exception: we only defined the C<many_to_many> relationship in one
+direction. Whereas we felt that we would want to map Authors to Books
+B<AND> Books to Authors, here we are only adding the convenience
+C<many_to_many> in the Users to Roles direction.
 
 Note that we do not need to make any change to the
-C<lib/MyApp/Schema.pm> schema file.  It simply tells DBIC to load all
-of the Result Class and ResultSet Class files it finds in below the
-C<lib/MyApp/Schema> directory, so it will automatically pick up our
-new table information.
+C<lib/MyApp/Schema.pm> schema file.  It simply tells DBIC to load all of
+the Result Class and ResultSet Class files it finds in below the
+C<lib/MyApp/Schema> directory, so it will automatically pick up our new
+table information.
 
 
 =head2 Sanity-Check of the Development Server Reload
 
-We aren't ready to try out the authentication just yet; we only want to 
-do a quick check to be sure our model loads correctly. Assuming that you 
-are following along and using the "-r" option on C<myapp_server.pl>, 
-then the development server should automatically reload (if not, press 
-C<Ctrl-C> to break out of the server if it's running and then enter 
-C<script/myapp_server.pl> to start it). Look for the three new model 
-objects in the startup debug output: 
+We aren't ready to try out the authentication just yet; we only want to
+do a quick check to be sure our model loads correctly. Assuming that you
+are following along and using the "-r" option on C<myapp_server.pl>,
+then the development server should automatically reload (if not, press
+C<Ctrl-C> to break out of the server if it's running and then enter
+C<script/myapp_server.pl> to start it). Look for the three new model
+objects in the startup debug output:
 
     ...
      .-------------------------------------------------------------------+----------.
@@ -205,12 +205,12 @@ objects in the startup debug output:
     | MyApp::Model::DB::Role                                            | class    |
     | MyApp::Model::DB::User                                            | class    |
     | MyApp::Model::DB::UserRole                                        | class    |
-    | MyApp::View::TT                                                   | instance |
+    | MyApp::View::HTML                                                 | instance |
     '-------------------------------------------------------------------+----------'
     ...
 
-Again, notice that your "Result Class" classes have been "re-loaded"
-by Catalyst under C<MyApp::Model>.
+Again, notice that your "Result Class" classes have been "re-loaded" by
+Catalyst under C<MyApp::Model>.
 
 
 =head2 Include Authentication and Session Plugins
@@ -223,13 +223,13 @@ C<StackTrace> is new):
         -Debug
         ConfigLoader
         Static::Simple
-
+    
         StackTrace
-
+    
         Authentication
-
+    
         Session
-        Session::Store::FastMmap
+        Session::Store::File
         Session::State::Cookie
     /;
 
@@ -243,61 +243,59 @@ C<Session> plugins are required to maintain state across multiple HTTP
 requests.
 
 Note that the only required Authentication class is the main one. This
-is a change that occurred in version 0.09999_01 of the
-C<Authentication> plugin. You B<do not need> to specify a particular
-Authentication::Store or Authentication::Credential plugin. Instead,
-indicate the Store and Credential you want to use in your application
-configuration (see below).
+is a change that occurred in version 0.09999_01 of the C<Authentication>
+plugin. You B<do not need> to specify a particular Authentication::Store
+or Authentication::Credential plugin. Instead, indicate the Store and
+Credential you want to use in your application configuration (see
+below).
 
-Make sure you include the additional plugins as new dependencies in
-the Makefile.PL file something like this:
+Make sure you include the additional plugins as new dependencies in the
+Makefile.PL file something like this:
 
     requires 'Catalyst::Plugin::Authentication';
     requires 'Catalyst::Plugin::Session';
-    requires 'Catalyst::Plugin::Session::Store::FastMmap';
+    requires 'Catalyst::Plugin::Session::Store::File';
     requires 'Catalyst::Plugin::Session::State::Cookie';
 
 Note that there are several options for
 L<Session::Store|Catalyst::Plugin::Session::Store>.
-L<Session::Store::Memcached|Catalyst::Plugin::Session::Store::Memcached> or
-L<Session::Store::FastMmap|Catalyst::Plugin::Session::Store::FastMmap> is
-generally a good choice if you are on Unix.  If you are running on
-Windows, try
-L<Session::Store::File|Catalyst::Plugin::Session::Store::File>. Consult
-L<Session::Store|Catalyst::Plugin::Session::Store> and its subclasses
-for additional information and options (for example to use a database-
-backed session store).
+L<Session::Store::Memcached|Catalyst::Plugin::Session::Store::Memcached>
+is generally a good choice if you are on Unix.  If you are running on
+Windows L<Session::Store::File|Catalyst::Plugin::Session::Store::File>
+is fine. Consult L<Session::Store|Catalyst::Plugin::Session::Store> and
+its subclasses for additional information and options (for example to
+use a database- backed session store).
 
 
 =head2 Configure Authentication
 
 There are a variety of ways to provide configuration information to
-L<Catalyst::Plugin::Authentication|Catalyst::Plugin::Authentication>.
-Here we will use 
-L<Catalyst::Authentication::Realm::SimpleDB|Catalyst::Authentication::Realm::SimpleDB>
-because it automatically sets a reasonable set of defaults for us. Open 
-C<lib/MyApp.pm> and place the following text above the call to
-C<__PACKAGE__-E<gt>setup();>:
+L<Catalyst::Plugin::Authentication>.  Here we will use
+L<Catalyst::Authentication::Realm::SimpleDB> because it automatically
+sets a reasonable set of defaults for us. Open C<lib/MyApp.pm> and place
+the following text above the call to C<__PACKAGE__-E<gt>setup();>:
 
     # Configure SimpleDB Authentication
-    __PACKAGE__->config->{'Plugin::Authentication'} = {
+    __PACKAGE__->config(
+        'Plugin::Authentication' => {
             default => {
                 class           => 'SimpleDB',
                 user_model      => 'DB::User',
                 password_type   => 'clear',
             },
-        };
-
-We could have placed this configuration in C<myapp.conf>, but placing 
-it in C<lib/MyApp.pm> is probably a better place since it's not likely 
-something that users of your application will want to change during 
-deployment (or you could use a mixture: leave C<class> and 
-C<user_model> defined in C<lib/MyApp.pm> as we show above, but place 
-C<password_type> in C<myapp.conf> to allow the type of password to be 
-easily modified during deployment).  We will stick with putting 
-all of the authentication-related configuration in C<lib/MyApp.pm> 
-for the tutorial, but if you wish to use C<myapp.conf>, just convert
-to the following code:
+        },
+    );
+
+We could have placed this configuration in C<myapp.conf>, but placing it
+in C<lib/MyApp.pm> is probably a better place since it's not likely
+something that users of your application will want to change during
+deployment (or you could use a mixture: leave C<class> and C<user_model>
+defined in C<lib/MyApp.pm> as we show above, but place C<password_type>
+in C<myapp.conf> to allow the type of password to be easily modified
+during deployment).  We will stick with putting all of the
+authentication-related configuration in C<lib/MyApp.pm> for the
+tutorial, but if you wish to use C<myapp.conf>, just convert to the
+following code:
 
     <Plugin::Authentication>
         <default>
@@ -307,23 +305,22 @@ to the following code:
         </default>
     </Plugin::Authentication>
 
-B<TIP:> Here is a short script that will dump the contents of 
-C<MyApp->config> to L<Config::General|Config::General> format in
-C<myapp.conf>:
+B<TIP:> Here is a short script that will dump the contents of
+C<MyApp->config> to L<Config::General> format in C<myapp.conf>:
 
-    $ CATALYST_DEBUG=0 perl -Ilib -e 'use MyApp; use Config::General; 
+    $ CATALYST_DEBUG=0 perl -Ilib -e 'use MyApp; use Config::General;
         Config::General->new->save_file("myapp.conf", MyApp->config);'
 
 B<HOWEVER>, if you try out the command above, be sure to delete the
 "myapp.conf" command.  Otherwise, you will wind up with duplicate
 configurations.
 
-B<NOTE:> Because we are using SimpleDB along with a database layout 
-that complies with its default assumptions: we don't need to specify
-the names of the columns where our username and password information
-is stored (hence, the "Simple" part of "SimpleDB").  That being said,
-SimpleDB lets you specify that type of information if you need to.
-Take a look at 
+B<NOTE:> Because we are using SimpleDB along with a database layout that
+complies with its default assumptions: we don't need to specify the
+names of the columns where our username and password information is
+stored (hence, the "Simple" part of "SimpleDB").  That being said,
+SimpleDB lets you specify that type of information if you need to.  Take
+a look at
 C<Catalyst::Authentication::Realm::SimpleDB|Catalyst::Authentication::Realm::SimpleDB>
 for details.
 
@@ -341,10 +338,10 @@ Remember, Catalyst is designed to be very flexible, and leaves such
 matters up to you, the designer and programmer.
 
 Then open C<lib/MyApp/Controller/Login.pm>, locate the
-C<sub index :Path :Args(0)> method (or C<sub index : Private> if you
-are using an older version of Catalyst) that was automatically
-inserted by the helpers when we created the Login controller above,
-and update the definition of C<sub index> to match:
+C<sub index :Path :Args(0)> method (or C<sub index : Private> if you are
+using an older version of Catalyst) that was automatically inserted by
+the helpers when we created the Login controller above, and update the
+definition of C<sub index> to match:
 
     =head2 index
     
@@ -370,18 +367,19 @@ and update the definition of C<sub index> to match:
                 return;
             } else {
                 # Set an error message
-                $c->stash->{error_msg} = "Bad username or password.";
+                $c->stash(error_msg => "Bad username or password.");
             }
         } else {
             # Set an error message
-            $c->stash->{error_msg} = "Empty username or password.";
+            $c->stash(error_msg => "Empty username or password.")
+                unless ($c->user_exists);
         }
     
         # If either of above don't work out, send to the login page
-        $c->stash->{template} = 'login.tt2';
+        $c->stash(template => 'login.tt2');
     }
 
-Be sure to remove the 
+Be sure to remove the
 C<$c-E<gt>response-E<gt>body('Matched MyApp::Controller::Login in Login.');>
 line of the C<sub index>.
 
@@ -389,25 +387,24 @@ This controller fetches the C<username> and C<password> values from the
 login form and attempts to authenticate the user.  If successful, it
 redirects the user to the book list page.  If the login fails, the user
 will stay at the login page and receive an error message.  If the
-C<username> and C<password> values are not present in the form, the
-user will be taken to the empty login form.
+C<username> and C<password> values are not present in the form, the user
+will be taken to the empty login form.
 
 Note that we could have used something like "C<sub default :Path>",
-however, it is generally recommended (partly for historical reasons,
-and partly for code clarity) only to use C<default> in
+however, it is generally recommended (partly for historical reasons, and
+partly for code clarity) only to use C<default> in
 C<MyApp::Controller::Root>, and then mainly to generate the 404 not
 found page for the application.
 
 Instead, we are using "C<sub somename :Path :Args(0) {...}>" here to
 specifically match the URL C</login>. C<Path> actions (aka, "literal
-actions") create URI matches relative to the namespace of the
-controller where they are defined.  Although C<Path> supports
-arguments that allow relative and absolute paths to be defined, here
-we use an empty C<Path> definition to match on just the name of the
-controller itself.  The method name, C<index>, is arbitrary. We make
-the match even more specific with the C<:Args(0)> action modifier --
-this forces the match on I<only> C</login>, not
-C</login/somethingelse>.
+actions") create URI matches relative to the namespace of the controller
+where they are defined.  Although C<Path> supports arguments that allow
+relative and absolute paths to be defined, here we use an empty C<Path>
+definition to match on just the name of the controller itself.  The
+method name, C<index>, is arbitrary. We make the match even more
+specific with the C<:Args(0)> action modifier -- this forces the match
+on I<only> C</login>, not C</login/somethingelse>.
 
 Next, update the corresponding method in
 C<lib/MyApp/Controller/Logout.pm> to match:
@@ -462,7 +459,7 @@ Create a login form by opening C<root/src/login.tt2> and inserting:
 We need something that provides enforcement for the authentication
 mechanism -- a I<global> mechanism that prevents users who have not
 passed authentication from reaching any pages except the login page.
-This is generally done via an C<auto> action/method in 
+This is generally done via an C<auto> action/method in
 C<lib/MyApp/Controller/Root.pm>.
 
 Edit the existing C<lib/MyApp/Controller/Root.pm> class file and insert
@@ -507,11 +504,10 @@ the following method:
 As discussed in
 L<Catalyst::Manual::Tutorial::03_MoreCatalystBasics/CREATE A CATALYST CONTROLLER>,
 every C<auto> method from the application/root controller down to the
-most specific controller will be called.  By placing the
-authentication enforcement code inside the C<auto> method of
-C<lib/MyApp/Controller/Root.pm> (or C<lib/MyApp.pm>), it will be
-called for I<every> request that is received by the entire
-application.
+most specific controller will be called.  By placing the authentication
+enforcement code inside the C<auto> method of
+C<lib/MyApp/Controller/Root.pm> (or C<lib/MyApp.pm>), it will be called
+for I<every> request that is received by the entire application.
 
 
 =head2 Displaying Content Only to Authenticated Users
@@ -551,15 +547,15 @@ use of an IF-THEN-ELSE construct in TT).
 
 =head2 Try Out Authentication
 
-The development server should have reloaded each time we edited one of 
-the Controllers in the previous section. Now trying going to 
-L<http://localhost:3000/books/list> and you should be redirected to the 
-login page, hitting Shift+Reload or Ctrl+Reload if necessary (the "You 
-are already logged in" message should I<not> appear -- if it does, click 
-the C<logout> button and try again). Note the C<***Root::auto User not 
-found...> debug message in the development server output. Enter username 
-C<test01> and password C<mypass>, and you should be taken to the Book 
-List page. 
+The development server should have reloaded each time we edited one of
+the Controllers in the previous section. Now try going to
+L<http://localhost:3000/books/list> and you should be redirected to the
+login page, hitting Shift+Reload or Ctrl+Reload if necessary (the "You
+are already logged in" message should I<not> appear -- if it does, click
+the C<logout> button and try again). Note the C<***Root::auto User not
+found...> debug message in the development server output. Enter username
+C<test01> and password C<mypass>, and you should be taken to the Book
+List page.
 
 B<IMPORTANT NOTE:> If you are having issues with authentication on
 Internet Explorer, be sure to check the system clocks on both your
@@ -585,6 +581,7 @@ box instead of using NTP.
 Open C<root/src/books/list.tt2> and add the following lines to the
 bottom (below the closing </table> tag):
 
+    ...
     <p>
       <a href="[% c.uri_for('/login') %]">Login</a>
       <a href="[% c.uri_for(c.controller.action_for('form_create')) %]">Create</a>
@@ -592,8 +589,8 @@ bottom (below the closing </table> tag):
 
 Reload your browser and you should now see a "Login" and "Create" links
 at the bottom of the page (as mentioned earlier, you can update template
-files without a development server reload).  Click the first link
-to return to the login page.  This time you I<should> see the "You are
+files without a development server reload).  Click the first link to
+return to the login page.  This time you I<should> see the "You are
 already logged in" message.
 
 Finally, click the C<You can logout here> link on the C</login> page.
@@ -603,85 +600,81 @@ need to log in to use this application."
 
 =head1 USING PASSWORD HASHES
 
-In this section we increase the security of our system by converting 
-from cleartext passwords to SHA-1 password hashes that include a 
-random "salt" value to make them extremely difficult to crack with
-dictionary and "rainbow table" attacks.
+In this section we increase the security of our system by converting
+from cleartext passwords to SHA-1 password hashes that include a random
+"salt" value to make them extremely difficult to crack with dictionary
+and "rainbow table" attacks.
 
 B<Note:> This section is optional.  You can skip it and the rest of the
 tutorial will function normally.
 
-Be aware that even with the techniques shown in this section, the browser
-still transmits the passwords in cleartext to your application.  We are
-just avoiding the I<storage> of cleartext passwords in the database by
-using a salted SHA-1 hash. If you are concerned about cleartext passwords
-between the browser and your application, consider using SSL/TLS, made
-easy with the Catalyst plugin Catalyst::Plugin:RequireSSL.
+Be aware that even with the techniques shown in this section, the
+browser still transmits the passwords in cleartext to your application.
+We are just avoiding the I<storage> of cleartext passwords in the
+database by using a salted SHA-1 hash. If you are concerned about
+cleartext passwords between the browser and your application, consider
+using SSL/TLS, made easy with the Catalyst plugin
+L<Catalyst::Plugin:RequireSSL>.
 
 
-=head2 Re-Run the DBIC::Schema Model Helper to Include DBIx::Class::EncodedColumn
+=head2 Re-Run the DBIC::Schema Model Helper to Include DBIx::Class::PassphraseColumn
 
-Next, we can re-run the model helper to have it include 
-L<DBIx::Class::EncodedColumn|DBIx::Class::EncodedColumn> in all of the 
-Result Classes it generates for us.  Simply use the same command we 
-saw in Chapters 3 and 4, but add C<,EncodedColumn> to the C<components>
-argument:
+Next, we can re-run the model helper to have it include
+L<DBIx::Class::PassphraseColumn> in all of the Result Classes it
+generates for us.  Simply use the same command we saw in Chapters 3 and
+4, but add C<,PassphraseColumn> to the C<components> argument:
 
     $ script/myapp_create.pl model DB DBIC::Schema MyApp::Schema \
-        create=static components=TimeStamp,EncodedColumn dbi:SQLite:myapp.db \
+        create=static components=TimeStamp,PassphraseColumn dbi:SQLite:myapp.db \
         on_connect_do="PRAGMA foreign_keys = ON"
 
-If you then open one of the Result Classes, you will see that it 
-includes EncodedColumn in the C<load_components> line.  Take a look at 
-C<lib/MyApp/Schema/Result/User.pm> since that's the main class where we
-want to use hashed and salted passwords:
+If you then open one of the Result Classes, you will see that it
+includes PassphraseColumn in the C<load_components> line.  Take a look
+at C<lib/MyApp/Schema/Result/User.pm> since that's the main class where
+we want to use hashed and salted passwords:
 
-    __PACKAGE__->load_components("InflateColumn::DateTime", "TimeStamp", "EncodedColumn");
+    __PACKAGE__->load_components("InflateColumn::DateTime", "TimeStamp", "PassphraseColumn");
 
 
-=head2 Modify the "password" Column to Use EncodedColumn
+=head2 Modify the "password" Column to Use PassphraseColumn
 
 Open the file C<lib/MyApp/Schema/Result/User.pm> and enter the following
 text below the "# DO NOT MODIFY THIS OR ANYTHING ABOVE!" line but above
 the closing "1;":
 
-    # Have the 'password' column use a SHA-1 hash and 10-character salt
-    # with hex encoding; Generate the 'check_password" method
+    # Have the 'password' column use a SHA-1 hash and 20-byte salt
+    # with RFC 2307 encoding; Generate the 'check_password" method
     __PACKAGE__->add_columns(
         'password' => {
-            data_type           => "TEXT",
-            size                => undef,
-            encode_column       => 1,
-            encode_class        => 'Digest',
-            encode_args         => {salt_length => 10},
-            encode_check_method => 'check_password',
+            passphrase       => 'rfc2307',
+            passphrase_class => 'SaltedDigest',
+            passphrase_args  => {
+                algorithm   => 'SHA-1',
+                salt_random => 20.
+            },
+            passphrase_check_method => 'check_password',
         },
     );
 
-This redefines the automatically generated definition for the password 
-fields at the top of the Result Class file to now use EncodedColumn 
-logic (C<encoded_column> is set to 1).  C<encode_class> can be set to 
-either C<Digest> to use 
-L<DBIx::Class::EncodedColumn::Digest|DBIx::Class::EncodedColumn::Digest>, 
-or C<Crypt::Eksblowfish::Bcrypt> for 
-L<DBIx::Class::EncodedColumn::Crypt::Eksblowfish::Bcrypt|DBIx::Class::EncodedColumn::Crypt::Eksblowfish::Bcrypt>.
-C<encode_args> is then used to customize the type of Digest you 
-selected. Here we only specified the size of the salt to use, but
-we could have also modified the hashing algorithm ('SHA-256' is 
-the default) and the format to use ('base64' is the default, but
-'hex' and 'binary' are other options).  To use these, you could 
-change the C<encode_args> to something like:
-
-            encode_args         => {algorithm => 'SHA-1', 
-                                    format => 'hex', 
-                                    salt_length => 10},
+This redefines the automatically generated definition for the password
+fields at the top of the Result Class file to now use PassphraseColumn
+logic, storing passwords in RFC 2307 format (C<passphrase> is set to
+C<rfc2307>).  C<passphrase_class> can be set to the name of any
+C<Authen::Passphrase::*> class, such as C<SaltedDigest> to use
+L<Authen::Passphrase::SaltedDigest>, or C<BlowfishCrypt> to use
+L<Authen::Passphrase::BlowfishCrypt>.  C<passphrase_args> is then used
+to customize the passphrase class you selected. Here we specified the
+digest algorithm to use as C<SHA-1> and the size of the salt to use, but
+we could have also specified any other option the selected passphrase
+class supports.
 
 
 =head2 Load Hashed Passwords in the Database
 
-Next, let's create a quick script to load some hashed and salted passwords
-into the C<password> column of our C<users> table.  Open the file
-C<set_hashed_passwords.pl> in your editor and enter the following text:
+Next, let's create a quick script to load some hashed and salted
+passwords into the C<password> column of our C<users> table.  Open the
+file C<set_hashed_passwords.pl> in your editor and enter the following
+text:
 
     #!/usr/bin/perl
     
@@ -699,88 +692,89 @@ C<set_hashed_passwords.pl> in your editor and enter the following text:
         $user->update;
     }
 
-EncodedColumn lets us simple call C<$user->check_password($password)> 
-to see if the user has supplied the correct password, or, as we show 
-above, call C<$user->update($new_password)> to update the hashed 
+PassphraseColumn lets us simply call C<$user->check_password($password)>
+to see if the user has supplied the correct password, or, as we show
+above, call C<$user->update($new_password)> to update the hashed
 password stored for this user.
 
 Then run the following command:
 
     $ DBIC_TRACE=1 perl -Ilib set_hashed_passwords.pl
 
-We had to use the C<-Ilib> argument to tell perl to look under the 
+We had to use the C<-Ilib> argument to tell perl to look under the
 C<lib> directory for our C<MyApp::Schema> model.
 
 The DBIC_TRACE output should show that the update worked:
 
     $ DBIC_TRACE=1 perl -Ilib set_hashed_passwords.pl
-    SELECT me.id, me.username, me.password, me.email_address, 
-    me.first_name, me.last_name, me.active FROM user me: 
-    UPDATE user SET password = ? WHERE ( id = ? ): 
-    'oXiyAcGOjowz7ISUhpIm1IrS8AxSZ9r4jNjpX9VnVeQmN6GRtRKTz', '1'
-    UPDATE user SET password = ? WHERE ( id = ? ): 
-    'PmyEPrkB8EGwvaF/DvJm7LIfxoZARjv8ygFIR7pc1gEA1OfwHGNzs', '2'
-    UPDATE user SET password = ? WHERE ( id = ? ): 
-    'h7CS1Fm9UCs4hjcbu2im0HumaHCJUq4Uriac+SQgdUMUfFSoOrz3c', '3'
+    SELECT me.id, me.username, me.password, me.email_address,
+    me.first_name, me.last_name, me.active FROM users me:
+    UPDATE users SET password = ? WHERE ( id = ? ):
+    '{SSHA}esgz64CpHMo8pMfgIIszP13ft23z/zio04aCwNdm0wc6MDeloMUH4g==', '1'
+    UPDATE users SET password = ? WHERE ( id = ? ):
+    '{SSHA}FpGhpCJus+Ea9ne4ww8404HH+hJKW/fW+bAv1v6FuRUy2G7I2aoTRQ==', '2'
+    UPDATE users SET password = ? WHERE ( id = ? ):
+    '{SSHA}ZyGlpiHls8qFBSbHr3r5t/iqcZE602XLMbkSVRRNl6rF8imv1abQVg==', '3'
 
 But we can further confirm our actions by dumping the users table:
 
-    $ sqlite3 myapp.db "select * from user"
-    1|test01|38d3974fa9e9263099f7bc2574284b2f55473a9bM=fwpX2NR8|t01@na.com|Joe|Blow|1
-    2|test02|6ed8586587e53e0d7509b1cfed5df08feadc68cbMJlnPyPt0I|t02@na.com|Jane|Doe|1
-    3|test03|af929a151340c6aed4d54d7e2651795d1ad2e2f7UW8dHoGv9z|t03@na.com|No|Go|0
+    $ sqlite3 myapp.db "select * from users"
+    1|test01|{SSHA}esgz64CpHMo8pMfgIIszP13ft23z/zio04aCwNdm0wc6MDeloMUH4g==|t01@na.com|Joe|Blow|1
+    2|test02|{SSHA}FpGhpCJus+Ea9ne4ww8404HH+hJKW/fW+bAv1v6FuRUy2G7I2aoTRQ==|t02@na.com|Jane|Doe|1
+    3|test03|{SSHA}ZyGlpiHls8qFBSbHr3r5t/iqcZE602XLMbkSVRRNl6rF8imv1abQVg==|t03@na.com|No|Go|0
 
-As you can see, the passwords are much harder to steal from the 
-database (not only are the hashes stored, but every hash is different 
-even though the passwords are the same because of the added "salt" 
-value).  Also note that this demonstrates how to use a DBIx::Class 
-model outside of your web application -- a very useful feature in many 
-situations.
+As you can see, the passwords are much harder to steal from the database
+(not only are the hashes stored, but every hash is different even though
+the passwords are the same because of the added "salt" value).  Also
+note that this demonstrates how to use a DBIx::Class model outside of
+your web application -- a very useful feature in many situations.
 
 
 =head2 Enable Hashed and Salted Passwords
 
-Edit C<lib/MyApp.pm> and update it to match the following text (the 
-only change is to the C<password_type> field):
+Edit C<lib/MyApp.pm> and update it to match the following text (the only
+change is to the C<password_type> field):
 
     # Configure SimpleDB Authentication
-    __PACKAGE__->config->{'Plugin::Authentication'} = {
+    __PACKAGE__->config(
+        'Plugin::Authentication' => {
             default => {
                 class           => 'SimpleDB',
                 user_model      => 'DB::User',
                 password_type   => 'self_check',
             },
-        };
+        },
+    );
 
-The use of C<self_check> will cause 
-Catalyst::Plugin::Authentication::Store::DBIC to call the 
+The use of C<self_check> will cause
+Catalyst::Plugin::Authentication::Store::DBIC to call the
 C<check_password> method we enabled on our C<password> columns.
 
 
 =head2 Try Out the Hashed Passwords
 
-The development server should restart as soon as your save the 
-C<lib/MyApp.pm> file in the previous section. You should now be able to 
-go to L<http://localhost:3000/books/list> and login as before. When 
-done, click the "logout" link on the login page (or point your browser 
-at L<http://localhost:3000/logout>). 
+The development server should restart as soon as your save the
+C<lib/MyApp.pm> file in the previous section. You should now be able to
+go to L<http://localhost:3000/books/list> and login as before. When
+done, click the "logout" link on the login page (or point your browser
+at L<http://localhost:3000/logout>).
 
 
 =head1 USING THE SESSION FOR FLASH
 
-As discussed in the previous chapter of the tutorial, C<flash> allows 
-you to set variables in a way that is very similar to C<stash>, but it 
-will remain set across multiple requests.  Once the value is read, it 
-is cleared (unless reset).  Although C<flash> has nothing to do with 
-authentication, it does leverage the same session plugins.  Now that 
-those plugins are enabled, let's go back and update the "delete and 
-redirect with query parameters" code seen at the end of the L<Basic 
-CRUD|Catalyst::Manual::Tutorial::04_BasicCRUD> chapter of the tutorial to 
-take advantage of C<flash>.
+As discussed in the previous chapter of the tutorial, C<flash> allows
+you to set variables in a way that is very similar to C<stash>, but it
+will remain set across multiple requests.  Once the value is read, it is
+cleared (unless reset).  Although C<flash> has nothing to do with
+authentication, it does leverage the same session plugins.  Now that
+those plugins are enabled, let's go back and update the "delete and
+redirect with query parameters" code seen at the end of the
+L<Basic CRUD|Catalyst::Manual::Tutorial::04_BasicCRUD> chapter of the
+tutorial to take advantage of C<flash>.
 
-First, open C<lib/MyApp/Controller/Books.pm> and modify C<sub delete>
-to match the following (everything after the model search line of code
-has changed):
+First, open C<lib/MyApp/Controller/Books.pm> and modify C<sub delete> to
+match the following (everything after the model search line of code has
+changed):
 
     =head2 delete
     
@@ -815,10 +809,10 @@ flash vs. the C<status_msg> query parameter:
     </div><!-- end content -->
     ...
 
-Although the sample above only shows the C<content> div, leave the
-rest of the file intact -- the only change we made to replace 
-"|| c.request.params.status_msg" with "c.flash.status_msg" in the 
-C<< <span class="message"> >> line.
+Although the sample above only shows the C<content> div, leave the rest
+of the file intact -- the only change we made to replace "||
+c.request.params.status_msg" with "c.flash.status_msg" in the
+C<E<lt>span class="message"E<gt>> line.
 
 
 =head2 Try Out Flash
@@ -831,59 +825,62 @@ several books.  Click the "Return to list" link and delete one of the
 
 B<NOTE:> While C<flash> will save information across multiple requests,
 I<it does get cleared the first time it is read>.  In general, this is
-exactly what you want -- the C<flash> message will get displayed on
-the next screen where it's appropriate, but it won't "keep showing up"
-after that first time (unless you reset it).  Please refer to
-L<Catalyst::Plugin::Session|Catalyst::Plugin::Session> for additional
-information.
+exactly what you want -- the C<flash> message will get displayed on the
+next screen where it's appropriate, but it won't "keep showing up" after
+that first time (unless you reset it).  Please refer to
+L<Catalyst::Plugin::Session> for additional information.
 
 
 =head2 Switch To Flash-To-Stash
 
-Although the a use of flash above works well, the
+Although the use of flash above works well, the
 C<status_msg || c.flash.status_msg> statement is a little ugly. A nice
 alternative is to use the C<flash_to_stash> feature that automatically
-copies the content of flash to stash.  This makes your controller
-and template code work regardless of where it was directly access, a
-forward, or a redirect.  To enable C<flash_to_stash>, you can either
-set the value in C<lib/MyApp.pm> by changing the default
+copies the content of flash to stash.  This makes your controller and
+template code work regardless of where it was directly access, a
+forward, or a redirect.  To enable C<flash_to_stash>, you can either set
+the value in C<lib/MyApp.pm> by changing the default
 C<__PACKAGE__-E<gt>config> setting to something like:
 
     __PACKAGE__->config(
             name    => 'MyApp',
             # Disable deprecated behavior needed by old applications
             disable_component_resolution_regex_fallback => 1,
-            session => { flash_to_stash => 1 },
+            'Plugin::Session' => { flash_to_stash => 1 },
         );
 
 B<or> add the following to C<myapp.conf>:
 
-    <session>
+    <Plugin::Session>
         flash_to_stash   1
-    </session>
+    </Plugin::Session>
 
-The C<__PACKAGE__-E<gt>config> option is probably preferable here
-since it's not something you will want to change at runtime without it
+The C<__PACKAGE__-E<gt>config> option is probably preferable here since
+it's not something you will want to change at runtime without it
 possibly breaking some of your code.
 
-Then edit C<root/src/wrapper.tt2> and change the C<status_msg> line
-to match the following:
+Then edit C<root/src/wrapper.tt2> and change the C<status_msg> line to
+match the following:
 
     <span class="message">[% status_msg %]</span>
 
-Now go to L<http://localhost:3000/books/list> in your browser. Delete 
-another of the "Test" books you added in the previous step. Flash should 
-still maintain the status message across the redirect even though you 
-are no longer explicitly accessing C<c.flash>. 
+Now go to L<http://localhost:3000/books/list> in your browser. Delete
+another of the "Test" books you added in the previous step. Flash should
+still maintain the status message across the redirect even though you
+are no longer explicitly accessing C<c.flash>.
 
 
 =head1 AUTHOR
 
 Kennedy Clark, C<hkclark@gmail.com>
 
-Please report any errors, issues or suggestions to the author.  The
-most recent version of the Catalyst Tutorial can be found at
+Feel free to contact the author for any errors or suggestions, but the
+best way to report issues is via the CPAN RT Bug system at
+<https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Manual>.
+
+The most recent version of the Catalyst Tutorial can be found at
 L<http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Manual/5.80/trunk/lib/Catalyst/Manual/Tutorial/>.
 
-Copyright 2006-2008, Kennedy Clark, under Creative Commons License
+Copyright 2006-2010, Kennedy Clark, under the
+Creative Commons Attribution Share-Alike License Version 3.0
 (L<http://creativecommons.org/licenses/by-sa/3.0/us/>).