tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,563 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

6828 Commits

Author SHA1 Message Date
Jose Gonzalez ac144de6d6 WIP: Minor fixes 2023-02-06 10:17:51 +01:00
Jose Gonzalez a9df7e2ec5 WIP: Improve somethings 2023-02-03 16:36:04 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jonathan 0437e46b5b #10217 CSRF for enable/disable users 2023-02-03 14:14:44 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Rafael Ameijeiras 30a0e2abe8 Merge branch 'ent-10076-anadir-un-acceso-mas-directo-a-attachments-plugins' into 'develop' 
Ent 10076 anadir un acceso mas directo a attachments plugins

See merge request artica/pandorafms!5441
 2023-02-03 09:36:53 +00:00
Daniel Rodriguez 67a4e2b04b Merge branch 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' into 'develop' 
fix server status when distinct timezones

See merge request artica/pandorafms!5439
 2023-02-02 16:07:02 +00:00
Jonathan 925880dbdb #9523 dialog title plugins 2023-02-02 17:06:28 +01:00
Rafael Ameijeiras 3bc593e58a Merge branch 'ent-10219-stored-cross-site-scripting-in-syslog-section' into 'develop' 
Ent 10219 stored cross site scripting in syslog section

See merge request artica/pandorafms!5464
 2023-02-02 10:02:32 +00:00
Rafael Ameijeiras ccb93c0918 Merge branch 'ent-10163-Remote-Code-Execution-via-Unrestricted-File-Upload' into 'develop' 
fixed vulnerability

See merge request artica/pandorafms!5476
 2023-02-02 10:02:15 +00:00
Diego Muñoz-Reja acb7416148 Merge branch 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none' into 'develop' 
Ent 10236 14934 module bulk operations anade dynamic interval a los modulos a pesar de estar en none

See merge request artica/pandorafms!5471
 2023-02-01 14:17:15 +00:00
Jimmy Olano c4659f0c58 Merge branch 'ent-10126-no-permite-editar-etiqueta-en-elemento-de-consola-visual' into 'develop' 
Ent 10126 no permite editar etiqueta en elemento de consola visual

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10126

See merge request artica/pandorafms!5407
 2023-02-01 10:56:25 +00:00
alejandro.campos@artica.es a69f3eb0dc minor change 2023-02-01 10:24:35 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Daniel Cebrian dcb69c2cf4 Merge branch 'develop' into 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none' 
# Conflicts:
#   pandora_console/godmode/massive/massive_edit_modules.php
 2023-01-31 15:10:26 +00:00
Jose Gonzalez fbdd91e4ff Improve user profile list view 2023-01-31 12:59:49 +01:00
Daniel Cebrian bbb249d031 #10126 clear log 2023-01-31 12:13:57 +01:00
alejandro.campos@artica.es a0c311c110 fixed vulnerability 2023-01-30 19:47:02 +01:00
Jose Gonzalez 891e485781 Fixed users list view 2023-01-30 16:14:05 +01:00
Jose Gonzalez 0162767f6d Clean debug 2023-01-30 13:39:58 +01:00
Rafael Ameijeiras 4984599132 Merge branch 'ent-9175-13829-visualizacion-de-contrasenas-en-texto-plano-dentro-del-inspector-onenet-pakistan' into 'develop' 
Ent 9175 13829 visualizacion de contrasenas en texto plano dentro del inspector onenet pakistan

See merge request artica/pandorafms!5392
 2023-01-30 11:24:39 +00:00
Rafael Ameijeiras 24528f29e4 Merge branch 'ent-10210-14895-Valor-seleccionado-por-defecto-para-el-intervalo-dinamico-se-establece-en-5-min-cuando-aparece-como-none' into 'develop' 
fixed default value

See merge request artica/pandorafms!5459
 2023-01-30 10:31:57 +00:00
Daniel Cebrian 0bf97acf50 #10236 fixed typed control 2023-01-27 13:39:41 +01:00
Jonathan 27b42d3137 #10076 add easy acces on directorys 2023-01-27 13:23:48 +01:00
Daniel Cebrian f62df0253f #10236 fixed dynamic_interval in bulk operations 2023-01-27 13:18:57 +01:00
Daniel Cebrian c2a16eb311 #10219 added db_escape_string_sql for control quotes 2023-01-26 16:34:35 +01:00
Daniel Cebrian 9282aa2319 #10219 fixed xss injection in syslog 2023-01-26 16:20:25 +01:00
Rafael Ameijeiras 7c379062cf Merge branch 'ent-10160-stored-cross-site-scripting-vulnerability-in-visual-console-module' into 'develop' 
Ent 10160 stored cross site scripting vulnerability in visual console module

See merge request artica/pandorafms!5447
 2023-01-26 12:55:15 +00:00
Rafael Ameijeiras 7bdfb1a096 Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop' 
Added child module delete warning

See merge request artica/pandorafms!5429
 2023-01-26 12:53:03 +00:00
alejandro.campos@artica.es 8e8db9c666 fixed default value 2023-01-26 12:36:33 +01:00
Alejandro Campos 87d09d47ca Merge branch 'develop' into 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' 
# Conflicts:
#   pandora_console/extras/mr/61.sql
 2023-01-26 09:53:51 +00:00
Rafael Ameijeiras 8f88827c0b Merge branch 'ent-7936-12354-anadir-opcion-dashboard-en-home-screen-de-usuario-en-meta' into 'develop' 
Added home page dashboard to metaconsole

See merge request artica/pandorafms!5452
 2023-01-25 14:40:20 +00:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Calvo 91e8cc2633 Added home page dashboard to metaconsole 2023-01-24 14:22:33 +01:00
Rafael Ameijeiras 2be4dc7960 Merge branch 'ent-9069-schedule-downtime-poner-decente-el-filtro' into 'develop' 
Ent 9069 schedule downtime poner decente el filtro

See merge request artica/pandorafms!5398
 2023-01-24 12:03:10 +00:00
Rafael Ameijeiras 1ed1b19cd0 Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop' 
Fix list all private dashboards on user edition

See merge request artica/pandorafms!5320
 2023-01-24 11:59:23 +00:00
Calvo 5d0826f412 Delete modules with children message 2023-01-24 12:26:49 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Daniel Cebrian 7163b3d853 #10160 fixed xss vulnerability in visual console name 2023-01-23 16:47:27 +01:00
Daniel Rodriguez 0a4ddc480a Merge branch 'ent-10106-borrar-sesion-de-usuario-cuando-se-borra-un-usuario' into 'develop' 
Ent 10106 borrar sesion de usuario cuando se borra un usuario

See merge request artica/pandorafms!5397
 2023-01-23 15:28:19 +00:00
Jonathan 60756ebb18 #10076 attachments-plugins icon tab 2023-01-23 13:01:31 +01:00
Jonathan aacf069acf #10076 attachments-plugins access 2023-01-23 11:19:59 +01:00
Jonathan c380a588ea #10076 attachments-plugins access 2023-01-23 11:07:34 +01:00
alejandro.campos@artica.es a2076ffd0c fix server status when distinct timezones 2023-01-20 13:11:49 +01:00
Calvo 8c071532e9 Added child module delete warning 2023-01-19 10:34:13 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Calvo 2fc1abc893 Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio 2023-01-18 11:33:21 +01:00
Jose Gonzalez 8c1bd2c1ee Agent module manager fixed and improve action buttons 2023-01-17 15:21:07 +01:00
Daniel Rodriguez a165eec2a1 Merge branch 'ent-8558-inventario-pasa-de-enterprise-open' into 'develop' 
Move inventory to open

See merge request artica/pandorafms!5105
 2023-01-16 13:43:19 +00:00
Jose Gonzalez 8c852fb3df Agent improvements 2023-01-16 01:28:53 +01:00
Jose Gonzalez 7277e026cd New notifications and added autoclose function 2023-01-13 14:23:48 +01:00
Pablo Aragon 4392bd7fa8 9220 Restrict access to collections with nms license 2023-01-13 12:09:15 +01:00
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Calvo ce224d67ba Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2023-01-13 09:08:17 +01:00
Daniel Rodriguez 29624c92e8 Merge branch 'ent-9618-ver-la-ip-contra-la-que-se-esta-ejecutado-un-modulo-remoto-en-la-vista-de-agente' into 'develop' 
Ent 9618 ver la ip contra la que se esta ejecutado un modulo remoto en la vista de agente

See merge request artica/pandorafms!5393
 2023-01-12 12:25:35 +00:00
Daniel Cebrian aff91aa1b2 #10126 added button save in visual console 2023-01-12 12:42:48 +01:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Daniel Cebrian 31d0cceecc #10131 fixed error 500 in module templates 2023-01-11 17:00:39 +01:00
Daniel Cebrian 0f7ffec6aa #9069 fixed style in SCHEDULED DOWNTIME form 2023-01-11 13:57:46 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 118099cd24 Minor fixes and solve issues with module templates 2023-01-11 13:02:18 +01:00
Daniel Cebrian a7fccc2f77 #10106 deleted session when user is deleted 2023-01-11 10:59:52 +01:00
Daniel Rodriguez 1ce72edf0f Merge branch 'ent-9878-meta-anadir-multiselector-de-servidores-a-la-edicion-de-filtros-de-eventos' into 'develop' 
add new field for filters events pandora_enterprise#9878

See merge request artica/pandorafms!5391
 2023-01-11 09:38:11 +00:00
Daniel Rodriguez c6f522d2bf Merge branch 'ent-9984-orden-snmp-v3-en-recon-discovery' into 'develop' 
Ent 9984 orden snmp v3 en recon discovery

See merge request artica/pandorafms!5386
 2023-01-10 16:19:29 +00:00
Daniel Rodriguez 2f4758009b Merge branch 'ent-9817-duplicado-de-perfiles-al-crear-agente' into 'develop' 
Ent 9817 duplicado de perfiles al crear agente

See merge request artica/pandorafms!5377
 2023-01-10 16:18:24 +00:00
Jose Gonzalez 4cb5055488 TODO added 2023-01-10 15:16:58 +01:00
Daniel Cebrian df87c122af added ip in modules list 2023-01-10 10:50:47 +01:00
Pablo Aragon 72acbae5a6 Hide module password value 2023-01-10 10:23:09 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +01:00
daniel c5ed1418e0 add new field for filters events pandora_enterprise#9878 2023-01-10 09:57:04 +01:00
Daniel Cebrian a4d23f5c59 #9984 changed order inputs in snmp v3 2023-01-09 12:10:48 +01:00
Enrique Martin 2cf0e301c5 Merge branch 'ent-9758-14470-alertas-triggereadas-deshabilitadas-cuentan-en-el-group-view' into 'develop' 
Ent 9758 14470 alertas triggereadas deshabilitadas cuentan en el group view

See merge request artica/pandorafms!5369
 2023-01-05 11:46:53 +00:00
Enrique Martin 502f43df9c Merge branch 'ent-10034-acl-enterprise-pfms-error-al-crear-perfil' into 'develop' 
Ent 10034 acl enterprise pfms error al crear perfil

See merge request artica/pandorafms!5376
 2023-01-05 11:43:05 +00:00
Daniel Cebrian d3136a8be5 #9817 fixed input_json_profile hidden in update user 2023-01-05 09:01:06 +01:00
Calvo c8bbf1e2dc Fix minor bug 2023-01-05 08:56:07 +01:00
Diego Muñoz-Reja 14e703d1c3 Merge branch 'ent-10074-content-type-cannot-be-modified-on-snmp-alert-with-email-action' into 'develop' 
Ent 10074 content type cannot be modified on snmp alert with email action

See merge request artica/pandorafms!5362
 2023-01-04 16:06:16 +00:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Jose Gonzalez 8728551c08 Agent details modules table upgraded 2023-01-04 15:46:32 +01:00
Daniel Cebrian 5fb435796b #10034 fixed option blank in ENTERPRISE ACL SETUP 2023-01-04 12:14:59 +01:00
Jonathan b9d6898639 #9758 update_alert_count on enable/disable alerts 2023-01-03 15:09:18 +01:00
Jose Gonzalez 03226b1f23 Polishing agent main view 2023-01-02 16:50:13 +01:00
Calvo 19fe7ffe73 Fix minor bug 2022-12-30 15:04:07 +01:00
Calvo 867749f9d3 Fix inventory blacklist open 2022-12-29 18:14:43 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Jonathan 707763f5e2 #10074 snmp alert edit content_type 2022-12-29 14:55:30 +01:00
Calvo fc7187ed0c Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 18:32:49 +01:00
Calvo 0e2829eca0 Fix inventory blacklist js 2022-12-28 18:28:03 +01:00
Rafael Ameijeiras 6b4bc8b9b0 Merge branch 'ent-9903-no-permitir-nombres-de-perfiles-duplicados' into 'develop' 
Ent 9903 no permitir nombres de perfiles duplicados

See merge request artica/pandorafms!5321
 2022-12-28 10:01:46 +00:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Rafael Ameijeiras 7c0b6330bd Merge branch 'ent-9997-quitar-using-module-component-de-la-edicion-de-modulo' into 'develop' 
Ent 9997 quitar using module component de la edicion de modulo

See merge request artica/pandorafms!5354
 2022-12-28 09:49:42 +00:00
Rafael Ameijeiras fa034e4ae2 Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop' 
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas

See merge request artica/pandorafms!5359
 2022-12-28 09:42:23 +00:00
Rafael Ameijeiras db7205fed3 Merge branch 'ent-9996-descripcion-incorrecta-al-crear-modulo-ssh' into 'develop' 
Ent 9996 descripcion incorrecta al crear modulo ssh

See merge request artica/pandorafms!5351
 2022-12-28 09:37:04 +00:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
Calvo f8b3183ad3 Moved inventory blacklist to open 2022-12-27 13:02:03 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
Daniel Rodriguez 05687a9ef2 Merge branch 'ent-1841-filtro-por-so-en-politicas-cepsa' into 'develop' 
SO filter on policy

See merge request artica/pandorafms!5331
 2022-12-23 09:38:29 +00:00
Jonathan c89d80e7e7 #9997 Module agent on edit don't show template 2022-12-23 09:44:15 +01:00