Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
a7305840
Commit
a7305840
authored
Aug 14, 2016
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(mvc, api) add error handling for api calls,
https://github.com/opnsense/core/issues/1136
parent
d0e7a795
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
ApiControllerBase.php
...e/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
+12
-0
api.php
src/opnsense/www/api.php
+5
-1
No files found.
src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php
View file @
a7305840
...
@@ -57,6 +57,17 @@ class ApiControllerBase extends ControllerRoot
...
@@ -57,6 +57,17 @@ class ApiControllerBase extends ControllerRoot
return
null
;
return
null
;
}
}
/**
* Raise errors, warnings, notices, etc.
* @param $errno
* @param $errstr
* @throws \Exception
*/
public
function
APIErrorHandler
(
$errno
,
$errstr
)
{
throw
new
\Exception
(
$errstr
.
' ['
.
$errno
.
']'
);
}
/**
/**
* Initialize API controller
* Initialize API controller
*/
*/
...
@@ -64,6 +75,7 @@ class ApiControllerBase extends ControllerRoot
...
@@ -64,6 +75,7 @@ class ApiControllerBase extends ControllerRoot
{
{
// disable view processing
// disable view processing
$this
->
view
->
disable
();
$this
->
view
->
disable
();
set_error_handler
(
array
(
$this
,
'APIErrorHandler'
));
}
}
/**
/**
...
...
src/opnsense/www/api.php
View file @
a7305840
...
@@ -25,5 +25,9 @@ try {
...
@@ -25,5 +25,9 @@ try {
echo
$application
->
handle
()
->
getContent
();
echo
$application
->
handle
()
->
getContent
();
}
catch
(
\Exception
$e
)
{
}
catch
(
\Exception
$e
)
{
echo
$e
->
getMessage
();
$response
=
array
();
$response
[
'errorMessage'
]
=
$e
->
getMessage
();
header
(
"Content-Type: application/json;charset=utf-8"
);
echo
htmlspecialchars
(
json_encode
(
$response
),
ENT_NOQUOTES
);
error_log
(
$e
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment