Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-07-09 03:04:07 -04:00
Code Actions Packages Releases Activity

Renamed api_log2 to api_log

Browse Source
This commit is contained in:
Jon Ziebell 2020-03-15 21:09:46 -04:00
parent e0f901e968
commit 6ea48160e9
3 changed files with 42 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/cora/api_log.php
View File

@ -8,7 +8,7 @@ namespace cora;
* *
* @author Jon Ziebell * @author Jon Ziebell
*/ */
class api_log extends crud { final class api_log extends crud {
/** /**
* Insert an item into the api_log resource. Force the IP to the request IP * Insert an item into the api_log resource. Force the IP to the request IP
@ -19,10 +19,6 @@ class api_log extends crud {
* @return int The ID of the inserted row. * @return int The ID of the inserted row.
*/ */
public function create($attributes) { public function create($attributes) {
$attributes['request_ip'] = ip2long($_SERVER['REMOTE_ADDR']);
$attributes['user_id'] = $this->session->get_user_id();
unset($attributes['request_timestamp']);
// Insert using the transactionless connection. // Insert using the transactionless connection.
$database = database::get_transactionless_instance(); $database = database::get_transactionless_instance();
return $database->create($this->resource, $attributes); return $database->create($this->resource, $attributes);
@ -32,13 +28,13 @@ class api_log extends crud {
* Get the number of requests since a given timestamp for a given IP * Get the number of requests since a given timestamp for a given IP
* address. Handy for rate limiting. * address. Handy for rate limiting.
* *
* @param string $request_ip The IP to look at. * @param string $ip_address The IP to look at.
* @param int $timestamp The timestamp to check from. * @param int $timestamp The timestamp to check from.
* *
* @return int The number of requests on or after $timestamp. * @return int The number of requests on or after $timestamp.
*/ */
public function get_number_requests_since($request_ip, $timestamp) { public function get_number_requests_since($ip_address, $timestamp) {
$request_ip_escaped = $this->database->escape(ip2long($request_ip)); $ip_address_escaped = $this->database->escape(ip2long($ip_address));
$timestamp_escaped = $this->database->escape( $timestamp_escaped = $this->database->escape(
date('Y-m-d H:i:s', $timestamp) date('Y-m-d H:i:s', $timestamp)
); );
@ -49,8 +45,8 @@ class api_log extends crud {
from from
`api_log` `api_log`
where where
`request_ip` = ' . $request_ip_escaped . ' `ip_address` = ' . $ip_address_escaped . '
and `request_timestamp` >= ' . $timestamp_escaped . ' and `timestamp` >= ' . $timestamp_escaped . '
'; ';
$result = $this->database->query($query); $result = $this->database->query($query);

58
api/cora/api_log2.php
View File

@ -1,58 +0,0 @@
<?php
namespace cora;
/**
* Stores a log of API requests and responses. Intended usage is to process
* the request to the end (exception or not) and then log it.
*
* @author Jon Ziebell
*/
final class api_log2 extends crud {
/**
* Insert an item into the api_log resource. Force the IP to the request IP
* and disallow overriding the timestamp.
*
* @param array $attributes The attributes to insert.
*
* @return int The ID of the inserted row.
*/
public function create($attributes) {
// Insert using the transactionless connection.
$database = database::get_transactionless_instance();
return $database->create($this->resource, $attributes);
}
/**
* Get the number of requests since a given timestamp for a given IP
* address. Handy for rate limiting.
*
* @param string $ip_address The IP to look at.
* @param int $timestamp The timestamp to check from.
*
* @return int The number of requests on or after $timestamp.
*/
public function get_number_requests_since($ip_address, $timestamp) {
$ip_address_escaped = $this->database->escape(ip2long($ip_address));
$timestamp_escaped = $this->database->escape(
date('Y-m-d H:i:s', $timestamp)
);
$query = '
select
count(*) `number_requests_since`
from
`api_log2`
where
`ip_address` = ' . $ip_address_escaped . '
and `timestamp` >= ' . $timestamp_escaped . '
';
$result = $this->database->query($query);
$row = $result->fetch_assoc();
return $row['number_requests_since'];
}
}

4
api/cora/request.php
View File

@ -224,7 +224,7 @@ final class request {
return false; return false;
} }
$api_log_resource = new api_log2(); $api_log_resource = new api_log();
$requests_this_minute = $api_log_resource->get_number_requests_since( $requests_this_minute = $api_log_resource->get_number_requests_since(
$_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_ADDR'],
(time() - 60) (time() - 60)
@ -287,7 +287,7 @@ final class request {
$database = database::get_instance(); $database = database::get_instance();
$session = session::get_instance(); $session = session::get_instance();
$setting = setting::get_instance(); $setting = setting::get_instance();
$api_log_resource = new api_log2(); $api_log_resource = new api_log();
// If exception. // If exception.
if(isset($this->response['data']['error_code']) === true) { if(isset($this->response['data']['error_code']) === true) {