Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31371/lib
Modified Files:
WikiUser.php Request.php
Log Message:
Fix bugs in access logging code.
Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WikiUser.php 2001年11月26日 22:37:29 1.2
--- WikiUser.php 2001年11月29日 18:03:59 1.3
***************
*** 171,178 ****
$this->_save();
header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
! header("HTTP/1.0 401 Unauthorized");
! if (ACCESS_LOG)
! $LogEntry->status = 401;
echo "<p>" . gettext ("You entered an invalid login or password.") . "\n";
if (ALLOW_BOGO_LOGIN) {
--- 171,177 ----
$this->_save();
+ $request = &$this->_request;
header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
! $request->setStatus("HTTP/1.0 401 Unauthorized");
echo "<p>" . gettext ("You entered an invalid login or password.") . "\n";
if (ALLOW_BOGO_LOGIN) {
Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Request.php 2001年11月17日 16:39:08 1.3
--- Request.php 2001年11月29日 18:03:59 1.4
***************
*** 6,10 ****
function Request() {
-
$this->_fix_magic_quotes_gpc();
$this->_fix_multipart_form_data();
--- 6,9 ----
***************
*** 26,30 ****
$this->cookies = new Request_CookieVars;
! $this->_log_entry = new Request_AccessLogEntry($this);
$TheRequest = $this;
--- 25,30 ----
$this->cookies = new Request_CookieVars;
! if (ACCESS_LOG)
! $this->_log_entry = & new Request_AccessLogEntry($this, ACCESS_LOG);
$TheRequest = $this;
***************
*** 62,66 ****
function redirect($url) {
header("Location: $url");
! $this->_log_entry->setStatus(302);
}
--- 62,87 ----
function redirect($url) {
header("Location: $url");
! if (isset($this->_log_entry))
! $this->_log_entry->setStatus(302);
! }
!
! function setStatus($status) {
! if (preg_match('|^HTTP/.*?\s(\d+)|i', $status, $m)) {
! header($status);
! $status = $m[1];
! }
! else {
! $status = (integer) $status;
! $reasons = array('200' => 'OK',
! '302' => 'Found',
! '400' => 'Bad Request',
! '401' => 'Unauthorized',
! '403' => 'Forbidden',
! '404' => 'Not Found');
! header(sprintf("HTTP/1.0 %d %s", $status, $reason[$status]));
! }
!
! if (isset($this->_log_entry))
! $this->_log_entry->setStatus($status);
}
***************
*** 271,334 ****
}
class Request_AccessLogEntry
{
! function AccessLogEntry ($request) {
! $this->host = $req->get('REMOTE_HOST');
! $this->ident = $req->get('REMOTE_IDENT');
! if (!$this->ident)
! $this->ident = '-';
! $this->user = '-';
! $this->time = time();
! $this->request = join(' ', array($req->get('REQUEST_METHOD'),
! $req->get('REQUEST_URI'),
! $req->get('SERVER_PROTOCOL')));
! $this->status = 200;
! $this->size = 0;
! $this->referer = (string) $req->get('HTTP_REFERER');
! $this->user_agent = (string) $req->get('HTTP_USER_AGENT');
! }
!
! //
! // Returns zone offset, like "-0800" for PST.
! //
! function _zone_offset () {
! $offset = date("Z", $this->time);
! if ($offset < 0)
! {
! $negoffset = "-";
! $offset = -$offset;
! }
! $offhours = floor($offset / 3600);
! $offmins = $offset / 60 - $offhours * 60;
! return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
! }
!
! // Format time into NCSA format.
! function _ncsa_time($time = false) {
! if (!$time)
! $time = time();
!
! return date("d/M/Y:H:i:s", $time) .
! " " . $this->_zone_offset();
! }
!
! function write($logfile) {
! $entry = sprintf('%s %s %s [%s] "%s" %d %d "%s" "%s"',
! $this->host, $this->ident, $this->user,
! $this->_ncsa_time($this->time),
! $this->request, $this->status, $this->size,
! $this->referer, $this->user_agent);
!
! //Error log doesn't provide locking.
! //error_log("$entry\n", 3, $logfile);
!
! // Alternate method
! if (($fp = fopen($logfile, "a")))
! {
! flock($fp, LOCK_EX);
! fputs($fp, "$entry\n");
! fclose($fp);
! }
! }
}
--- 292,437 ----
}
+ /**
+ * Create NCSA "combined" log entry for current request.
+ */
class Request_AccessLogEntry
+ {
+ /**
+ * Constructor.
+ *
+ * The log entry will be automatically appended to the log file
+ * when the current request terminates.
+ *
+ * If you want to modify a Request_AccessLogEntry before it gets
+ * written (e.g. via the setStatus and setSize methods) you should
+ * use an '&' on the constructor, so that you're working with the
+ * original (rather than a copy) object.
+ *
+ * <pre>
+ * $log_entry = & new Request_AccessLogEntry($req, "/tmp/wiki_access_log");
+ * $log_entry->setStatus(401);
+ * </pre>
+ *
+ *
+ * @param $request object Request object for current request.
+ * @param $logfile string Log file name.
+ */
+ function Request_AccessLogEntry ($request, $logfile) {
+ $this->logfile = $logfile;
+
+ $this->host = $request->get('REMOTE_HOST');
+ $this->ident = $request->get('REMOTE_IDENT');
+ if (!$this->ident)
+ $this->ident = '-';
+ $this->user = '-'; // FIXME: get logged-in user name
+ $this->time = time();
+ $this->request = join(' ', array($request->get('REQUEST_METHOD'),
+ $request->get('REQUEST_URI'),
+ $request->get('SERVER_PROTOCOL')));
+ $this->status = 200;
+ $this->size = 0;
+ $this->referer = (string) $request->get('HTTP_REFERER');
+ $this->user_agent = (string) $request->get('HTTP_USER_AGENT');
+
+ global $Request_AccessLogEntry_entries;
+ if (!isset($Request_AccessLogEntry_entries)) {
+ register_shutdown_function("Request_AccessLogEntry_shutdown_function");
+ }
+ $Request_AccessLogEntry_entries[] = &$this;
+ }
+
+ /**
+ * Set result status code.
+ *
+ * @param $status integer HTTP status code.
+ */
+ function setStatus ($status) {
+ trigger_error("setStatus: $status", E_USER_WARNING);
+
+ $this->status = $status;
+ }
+
+ /**
+ * Set response size.
+ *
+ * @param $size integer
+ */
+ function setSize ($size) {
+ $this->size = $size;
+ }
+
+ /**
+ * Get time zone offset.
+ *
+ * This is a static member function.
+ *
+ * @param $time integer Unix timestamp (defaults to current time).
+ * @return string Zone offset, e.g. "-0800" for PST.
+ */
+ function _zone_offset ($time = false) {
+ if (!$time)
+ $time = time();
+ $offset = date("Z", $time);
+ if ($offset < 0) {
+ $negoffset = "-";
+ $offset = -$offset;
+ }
+ $offhours = floor($offset / 3600);
+ $offmins = $offset / 60 - $offhours * 60;
+ return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
+ }
+
+ /**
+ * Format time in NCSA format.
+ *
+ * This is a static member function.
+ *
+ * @param $time integer Unix timestamp (defaults to current time).
+ * @return string Formatted date & time.
+ */
+ function _ncsa_time($time = false) {
+ if (!$time)
+ $time = time();
+
+ return date("d/M/Y:H:i:s", $time) .
+ " " . $this->_zone_offset();
+ }
+
+ /**
+ * Write entry to log file.
+ */
+ function write() {
+ $entry = sprintf('%s %s %s [%s] "%s" %d %d "%s" "%s"',
+ $this->host, $this->ident, $this->user,
+ $this->_ncsa_time($this->time),
+ $this->request, $this->status, $this->size,
+ $this->referer, $this->user_agent);
+
+ //Error log doesn't provide locking.
+ //error_log("$entry\n", 3, $this->logfile);
+
+ // Alternate method
+ if (($fp = fopen($this->logfile, "a"))) {
+ flock($fp, LOCK_EX);
+ fputs($fp, "$entry\n");
+ fclose($fp);
+ }
+ }
+ }
+
+ /**
+ * Shutdown callback.
+ *
+ * @access private
+ * @see Request_AccessLogEntry
+ */
+ function Request_AccessLogEntry_shutdown_function ()
{
! global $Request_AccessLogEntry_entries;
!
! foreach ($Request_AccessLogEntry_entries as $entry) {
! $entry->write();
! }
! unset($Request_AccessLogEntry_entries);
}