Changeset 41 in bookmarks for trunk

Timestamp:

05/30/13 15:15:05 (12 years ago)

Author:

peter

Message:

• move the reverse proxy check and change to SERVER_NAME from the BookmarkApp to the index.cgi script
• the dbname is passed in as a parameter to BookmarkApp

Location:

trunk

Files:

• BookmarkApp.pm (modified) (2 diffs)
• index.cgi (modified) (1 diff)

trunk/BookmarkApp.pm

@@ -11 +11 @@
 use Bookmarks;
 use URI;
-
-my $dbname = 'fk.db';
 
 sub setup {
@@ -24 +22 @@
         edit
     }]);
+
     my $base_uri = URI->new;
     $base_uri->scheme('http');
-    $base_uri->host($ENV{HTTP_X_FORWARDED_HOST} || $ENV{SERVER_NAME});
+    $base_uri->host($ENV{SERVER_NAME});
     $base_uri->port($ENV{SERVER_PORT});
     $base_uri->path($ENV{SCRIPT_NAME} . '/');
 
     my $bookmarks = Bookmarks->new({
-        dbname   => $dbname,
+        dbname   => $self->param('dbname'),
         base_uri => $base_uri,
     });

trunk/index.cgi

@@ -19 +19 @@
 
 package main;
-BookmarkApp::Dispatch->dispatch();
+# check for whether we are behind a reverse proxy, and adjust the SERVER_NAME accordingly
+# TODO: use something like Plack::Middlware::ReverseProxy instead
+$ENV{SERVER_NAME} = $ENV{HTTP_X_FORWARDED_HOST} if $ENV{HTTP_X_FORWARDED_HOST};
+
+BookmarkApp::Dispatch->dispatch(
+    args_to_new => {
+        #TODO: dbname should be in a config file
+        PARAMS => { dbname => 'fk.db' },
+    }
+);