pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

Merge branch '2-request-list-show-ip-http-method' into 'master'

Browse source 
Resolve "Request list - Show IP + HTTP Method."

Closes #2

See merge request pnx/httpcb!2
This commit is contained in:
Henrik Hautakoski 2018-03-19 19:50:42 +00:00
commit 279e6a30c1
5 changed files with 136 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

42
app/assets/less/components/request-item.less
View file

@ -35,23 +35,45 @@
}
}
&-uri {
display: inline-block;
width: 45%;
&-row {
display: block;
& + & {
margin-top: .4em;
}
}
&-size {
&-method,
&-uri,
&-type,
&-timestamp,
&-size,
&-ip {
display: inline-block;
width: 10%;
.icon {
margin: 0 .2em;
}
}
&-type,
&-timestamp,
&-size,
&-ip {
color: @request-item-light-color;
font-size: @font-size-small;
}
&-method {
font-weight: bold;
}
&-type,
&-size {
width: 30%;
}
&-ip,
&-timestamp {
display: inline-block;
width: 20%;
.icon {
padding: 0 .4em;
}
float: right;
}
}

1
app/assets/less/variables.less
View file

@ -164,6 +164,7 @@
// ----------------------------------
@request-item-color: @dark-grey;
@request-item-light-color: #666;
@request-item-background: transparent;
@request-item-border-color: @light-grey;
@request-item-active-color: @dark-grey;

35
app/controllers/CallbackController.php
View file

@ -122,25 +122,34 @@ class CallbackController extends ControllerBase
{
$this->view->disable();
$callback = Model\Data\Callback::get($id);
$allowed_methods = array('GET', 'POST');
if ($this->request->isMethod($allowed_methods)) {
$request = new Model\Data\Request();
$callback = Model\Data\Callback::get($id);
$request->setHeaders($this->request->getHeaders());
$request->setBody($this->request->getRawBody());
$request = new Model\Data\Request();
$dt = new DateTime();
$request->setHeaders($this->request->getHeaders());
$request->setBody($this->request->getRawBody());
$callback->setLastRequest($dt->format('Y-m-d H:i:s'));
$dt = new DateTime();
$meta = new Model\Data\RequestMeta();
$meta->Callback = $callback;
$meta->RequestObject = $request;
$meta->setUri($this->request->getServer('REQUEST_URI'));
$callback->setLastRequest($dt->format('Y-m-d H:i:s'));
$result = $meta->save();
if ($result == false) {
var_dump($meta->getMessages());
$meta = new Model\Data\RequestMeta();
$meta->Callback = $callback;
$meta->RequestObject = $request;
$meta->setSourceIp($this->request->getClientAddress());
$meta->setMethod($this->request->isPost() ? 'POST' : 'GET');
$meta->setUri($this->request->getServer('REQUEST_URI'));
$result = $meta->save();
if ($result == false) {
var_dump($meta->getMessages());
}
}
}
}

50
app/models/Data/RequestMeta.php
View file

@ -18,6 +18,20 @@ class RequestMeta extends Model
*/
protected $callbackid;
/**
* Source IP Address
*
* @var string
*/
protected $source_ip;
/**
* HTTP Method
*
* @var string
*/
protected $method;
/**
* HTTP Request Uri
*
@ -79,6 +93,42 @@ class RequestMeta extends Model
return $this;
}
/**
* @param string $source_ip
* @return RequestMeta
*/
public function setSourceIp($source_ip)
{
$this->source_ip = (string) $source_ip;
return $this;
}
/**
* @return mixed
*/
public function getSourceIp()
{
return $this->source_ip;
}
/**
* @param string $method
* @return RequestMeta
*/
public function setMethod($method)
{
$this->method = (string) $method;
return $this;
}
/**
* @return string
*/
public function getMethod()
{
return $this->method;
}
/**
* @param string $uri
* @return RequestMeta

43
app/views/callback/show.volt
View file

@ -14,21 +14,40 @@
data-toggle="collapse" data-parent="#request-log"
aria-expanded="true" aria-controls="request{{ index }}">
<span class="request-list-item-header-uri">
{{ icon('android-locate') }} <span class="url">{{ urlStyle(req.getUri()) }}</span>
</span>
<div class="request-list-item-header-row">
<span class="request-list-item-header-timestamp">
{{ icon('android-time') }} {{ req.getTimestamp() }}
</span>
<span class="request-list-item-header-method">
{{ req.getMethod() }}
</span>
<span class="request-list-item-header-uri">
<span class="url">{{ urlStyle(req.getUri()) }}</span>
</span>
<span class="request-list-item-header-timestamp">
{{ icon('android-time') }} {{ req.getTimestamp() }}
</span>
</div>
<div class="request-list-item-header-row">
<span class="request-list-item-header-type">
{{ icon('android-list') }} {{ req.getType() }}
</span>
<span class="request-list-item-header-size">
{{ icon('cube') }} {{ req.getSize() }} b
</span>
<span class="request-list-item-header-ip">
{{ icon('location') }} {{ req.getSourceIp() }}
</span>
</div>
<span class="request-list-item-header-type">
{{ icon('android-list') }} {{ req.getType() }}
</span>
<span class="request-list-item-header-size">
{{ icon('cube') }} {{ req.getSize() }} b
</span>
</a>
<div class="collapse" id="request{{ index }}"