Skip to content

refactor(agent): expose app metadata for csec via global symbol #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: security-agent-support
Choose a base branch
from
+111 −59
Open

refactor(agent): expose app metadata for csec via global symbol #922

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e5e379
expose app metadata for csec via global symbol
lavarou Jun 21, 2024
8b57353
make `nr_php_csec_get_metadata` easier to use
lavarou Jun 21, 2024
d162d86
refactor to avoid 'transport' struct
lavarou Jun 25, 2024
c1981db
simplify return value - always a string
lavarou Jun 26, 2024
2f616e1
remove csec agent config, update status log for csec config
anmol-ap Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
simplify return value - always a string 
This approach adds some level of protection (compiler type checking) from
misusing the API.
  • Loading branch information
@lavarou @anmol-ap
lavarou authored and anmol-ap committed Mar 13, 2025
commit c1981dbeb76ce53ec2fd74b2af1b3fc357eb6644
12 changes: 6 additions & 6 deletions agent/csec_metadata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "php_compat.h"
#include "php_newrelic.h"

int nr_php_csec_get_metadata(const nr_php_csec_metadata_key_t key, void** p) {
int nr_php_csec_get_metadata(const nr_php_csec_metadata_key_t key, char** p) {
const char* value = NULL;

if (NULL == p) {
Expand All @@ -27,12 +27,12 @@ int nr_php_csec_get_metadata(const nr_php_csec_metadata_key_t key, void** p) {

switch (key) {
case NR_PHP_CSEC_METADATA_HIGH_SECURITY:
*p = nr_zalloc(sizeof(int));
if (NULL == *p) {
return -3;
if (NRPRG(app)->info.high_security) {
value = "true";
} else {
value = "false";
}
*((int*)*p) = NRPRG(app)->info.high_security;
return 0;
break;
case NR_PHP_CSEC_METADATA_ENTITY_NAME:
value = nr_app_get_entity_name(NRPRG(app));
break;
Expand Down
7 changes: 4 additions & 3 deletions agent/csec_metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ typedef enum {
/*
* Purpose : Copy requested app meta data into allocated *value.
* The caller is responsible for freeing the memory
* allocated.
* allocated. The value is a string representation of
* the requested metadata.
*
* Params : Pointer to a nr_php_csec_metadata_t structure
*
Expand All @@ -32,7 +33,7 @@ typedef enum {
* -4 for invalid metadata key
* -5 for inability to retrieve metadata value
*/
extern int nr_php_csec_get_metadata(const nr_php_csec_metadata_key_t k, void** value);
typedef int (*nr_php_csec_get_metadata_t)(const nr_php_csec_metadata_key_t k, void** value);
extern int nr_php_csec_get_metadata(const nr_php_csec_metadata_key_t k, char** value);
typedef int (*nr_php_csec_get_metadata_t)(const nr_php_csec_metadata_key_t k, char** value);
#define NR_PHP_CSEC_GET_METADATA "nr_php_csec_get_metadata"
#endif