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

83 Commits

Author SHA1 Message Date
alejandro-campos 59e2930bec fixed global declaration in meta 2020-12-01 13:15:48 +01:00
alejandro-campos 241c90f201 fixed security vulnerability 2020-11-03 15:58:53 +01:00
Luis Calvo 7a35e8550c Fixed collections symlinks 2020-05-19 18:53:09 +02:00
Daniel Rodriguez ffce6399b0 Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop' 
Secured get_file script for unauthorized file download

See merge request artica/pandorafms!2999
 2020-01-13 16:46:20 +01:00
Jose Gonzalez f6163f4f80 Secured get_file script for unauthorized file download 2020-01-07 17:31:14 +01:00
Daniel Maya c79a4b2c01 fixed file vulnerability 2019-12-31 11:24:54 +01:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
Luis Calvo a5e80f5070 Fixed filemanager uploading on meta 
Former-commit-id: e3c4b6150e70c589763a50a7e3bac6175997dd17
 2019-04-24 11:12:26 +02:00
Tatiana Llorente 2a37224653 New design for the tables - #3707 
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
 2019-04-10 10:06:27 +02:00
Daniel Rodriguez cfa2c08b16 Merge branch 'ent-3668-No-se-puede-subir-ficheros-en-colecciones' into 'develop' 
fix bug in functions_filemanager

See merge request artica/pandorafms!2243

Former-commit-id: 8a00098cb8917cc309dc5fe3bc327e5c70f9417b
 2019-03-11 12:37:23 +01:00
alejandro-campos d760c7d701 fix bug in functions_filemanager 
Former-commit-id: 93507790a70eb673a5660357acfcdf9c68279047
 2019-03-06 17:07:37 +01:00
Daniel Maya cefaccb651 Fixed synchronize collections in node 
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
 2019-02-28 13:02:59 +01:00
daniel df88582982 fixed error filemanager 
Former-commit-id: 4bd54ef9c60396822a1a757bc91218b4d2244efa
 2019-02-19 17:52:25 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
danielmaya 04ebb6b2c5 Added delete function in the api 2018-11-19 11:28:35 +01:00
danielmaya 2a0d2e6c46 collection management from metaconsole 2018-11-13 08:33:47 +01:00
Arturo Gonzalez 64b926e482 Added qw perms 2017-11-28 13:36:33 +01:00
Alejandro Gallardo Escobar 64ec82f9d6 [Console] Added a notice to warn the users about the php files uploaded with the files manager 2017-10-30 16:04:58 +01:00
Arturo Gonzalez 18cfb9d6e2 Fixed edit file in collections. Ticket# 4126 2016-10-21 12:21:44 +02:00
m-lopez-f 9db6a2d244 Fixed problems with edit colecctions/plugins in pandora console. 2016-10-20 13:41:37 +02:00
Daniel Maya 24d466e185 Changes in the types of format accepted.Ticket #4032. 2016-09-16 09:23:52 +02:00
Daniel Maya a3cd8a7c86 FFixed editing plugins. Ticket #4032. 2016-09-15 15:47:10 +02:00
Hirofumi Kosaka d38d14cfe8 Fixed bug that url-unsafe chars could be generated for download URL. 
(e.g. multi-byte chars included in target file name)
 2016-07-15 16:33:16 +09:00
fbsanchez 744c07237f Fixed: File upload (mib upload)i 
> safe_output on field and php warning
 2016-07-04 10:51:16 +02:00
fbsanchez 8b99e9757a Fixed: File upload (mib upload)i 
> safe_output on field and php warning
 2016-07-04 10:48:18 +02:00
Daniel Maya ee4a5f4119 added new types of text. Ticket #3435. 2016-06-16 11:50:20 +02:00
Daniel Maya 36bb76bebc fixed table filemanager. Ticket #3435. 2016-06-14 12:06:38 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 458d9909d4 Now in the function 'filemanager_read_recursive_dir' returns the directories 
(cherry picked from commit ae97ad964d)

Conflicts:
	pandora_console/include/functions_filemanager.php
 2015-06-09 15:55:59 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
m-lopez-f 7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
mdtrooper 8efc616d19 Added the feature for the set the working directory of filemanager. Ticket #1228 2014-09-08 14:17:46 +02:00
mdtrooper bbc314b776 Some fixes for the empty text files in the filemanager. 2014-09-08 13:45:52 +02:00
alexhigh 5b95334ad0 2014-04-25 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* extensions/system_info.php,
	  godmode/servers/plugin.php,
	  godmode/setup/file_manager.php,
	  include/config_process.php,
	  include/functions_filemanager.php,
	  include/functions_html.php,
	  operation/gis_maps/ajax.php,
	  operation/snmpconsole/snmp_mib_uploader.php: Replaced
	the possible backslashes with slashes in the directories
	path.

	* include/functions_graph.php: Modified the function
	"grafico_modulo_log4x" to adapt the 'set_include_path' to
	Windows.

	* include/get_file.php: Now the file name comes from the
	function "basename".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9814 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-04-25 11:07:30 +00:00
mdtrooper 2f42ff5fc4 2013-09-05 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_filemanager.php: fixed PHP notice when this
	file is included and there is not a upload file action.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-09-05 06:41:02 +00:00
zarzuelo 15a8037d33 2013-08-02 Sergio Martin <sergio.martin@artica.es> 
* include/functions_filemanager.php: added new error message
	on file manager to warn when the post size limit is
	exceded by the uploaded file



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8623 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-02 12:38:38 +00:00
zarzuelo 6860129ced 2013-08-01 Sergio Martin <sergio.martin@artica.es> 
* include/functions_filemanager.php
	images/upload_file.png
	images/edit.png
	images/mimetypes/unknown.png
	images/mimetypes/image.png
	images/mimetypes/zip.png
	images/mimetypes/directory.png
	images/mimetypes/text.png
	images/create_directory.png
	images/create_file.png: Change icons on filemanager
	adding some usability improvements

	* index.php: Fix out of bounds of the footer in the
	policy modules view for bug #2320

	* godmode/massive/massive_operations.php: Fix double
	advertment alert

	* include/help/en/help_profile.php
	include/help/es/help_profile.php: Make changes on the
	ACLs table to put it with the same permissions of the 
	wiki



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8617 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-01 14:56:50 +00:00
zarzuelo 77ac82e004 2013-07-26 Sergio Martin <sergio.martin@artica.es> 
* include/functions_filemanager.php: Fixed file manager
	in metaconsole for bug #2361 and more little aesthetic fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8581 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-07-26 07:46:37 +00:00
mdtrooper 5bf1f2216f 2013-06-27 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/servers/plugin.php, godmode/setup/file_manager.php,
	include/functions_filemanager.php: added the filemanager to server
	plugin, and of course change the code for to make this feature.
	
	MERGED FROM THE BRANCH PANDORA_4_0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-06-27 11:42:53 +00:00
zarzuelo 96074ead91 2013-05-23 Sergio Martin <sergio.martin@artica.es> 
* include/functions_html.php
	include/styles/pandora_minimal.css
	include/styles/dialog.css
	include/styles/menu.css
	include/styles/jquery-ui-1.10.0.custom.css
	include/functions_events.php
	operation/events/events_list.php
	include/functions_snmp_browser.php
	include/styles/pandora.css: A lot of graphic
	changes including events form and snmp browser
	layout

	* include/ajax/module.php
	include/functions_ui.php
	include/functions.php
	include/functions_agents.php
	include/functions_graph.php
	include/graphs/functions_gd.php
	include/graphs/fgraph.php
	include/functions_reporting.php
	include/functions_filemanager.php
	include/javascript/pandora_snmp_browser.js
	include/functions_treeview.php
	include/constants.php
	index.php
	extensions/net_tools.php
	extensions/pandora_logs.php
	extensions/ssh_gateway.php
	extensions/update_manager/settings.php
	extensions/plugin_registration.php
	operation/incidents/incident.php
	operation/incidents/incident_detail.php
	operation/visual_console/render_view.php
	operation/users/user_edit.php
	operation/reporting/reporting_viewer.php
	operation/reporting/graph_viewer.php
	operation/agentes/datos_agente.php
	operation/agentes/alerts_status.php
	operation/agentes/estado_generalagente.php
	operation/agentes/custom_fields.php
	operation/agentes/estado_agente.php
	operation/agentes/estado_monitores.php
	operation/agentes/agent_fields.php
	operation/agentes/stat_win.php
	operation/servers/recon_view.php
	operation/integria_incidents/incident_detail.php
	operation/netflow/nf_live_view.php
	godmode/groups/configure_group.php
	godmode/groups/configure_modu_group.php
	godmode/groups/group_list.php
	godmode/db/db_refine.php
	godmode/db/db_event.php
	godmode/agentes/module_manager_editor_common.php
	godmode/agentes/fields_manager.php
	godmode/agentes/modificar_agente.php
	godmode/agentes/module_manager_editor.php
	godmode/servers/recon_script.php
	godmode/servers/plugin.php
	godmode/servers/manage_recontask.php
	godmode/servers/modificar_server.php
	godmode/setup/news.php
	godmode/setup/links.php
	godmode/setup/gis.php
	godmode/users/configure_profile.php
	godmode/massive/massive_add_alerts.php
	godmode/massive/massive_delete_profiles.php
	godmode/modules/module_list.php
	godmode/reporting/visual_console_builder.php
	godmode/reporting/map_builder.php
	godmode/reporting/graphs.php
	godmode/tag/tag.php
	godmode/tag/edit_tag.php: Changing the old way of 
	print errors to encapsulated UI function to unify 
	styles

	* images/status_sets/color_text/agent_no_monitors.png
	images/status_sets/color_text/agent_no_monitors_ball.pn
	images/status_sets/color_text/agent_down_ball.png
	images/status_sets/color_text/agent_down.png
	images/status_sets/default/agent_no_monitors.png
	images/status_sets/default/agent_no_monitors_ball.png
	images/status_sets/default/agent_down_ball.png
	images/status_sets/default/agent_down.png: Modify some
	status set images

	* images/gis_map/icons/star.default.png
	images/gis_map/icons/cross.warning.png
	images/gis_map/icons/star.bad.png
	images/gis_map/icons/cross.ok.png
	images/gis_map/icons/marker.default.png
	images/gis_map/icons/square_marker.warning.png
	images/gis_map/icons/circle.warning.png
	images/gis_map/icons/marker.bad.png
	images/gis_map/icons/square_marker.ok.png
	images/gis_map/icons/circle.ok.png
	images/gis_map/icons/triangle.warning.png
	images/gis_map/icons/cross.default.png
	images/gis_map/icons/star.warning.png
	images/gis_map/icons/triangle.ok.png
	images/gis_map/icons/cross.bad.png
	images/gis_map/icons/star.ok.png
	images/gis_map/icons/square_marker.default.png
	images/gis_map/icons/circle.default.png
	images/gis_map/icons/marker.warning.png
	images/gis_map/icons/square_marker.bad.png
	images/gis_map/icons/circle.bad.png
	images/gis_map/icons/triangle.default.png
	images/gis_map/icons/marker.ok.png
	images/gis_map/icons/triangle.bad.png: Change whole the
	gis icons by new ones

	* images/os_icons/so_win.png
	images/os_icons/so_linux.png
	images/os_icons/so_mac.png
	images/os_icons/so_cisco.png
	images/os_icons/so_vmware.png
	images/os_icons/so_bsd.png
	images/os_icons/android.png
	images/os_icons/so_aix.png
	images/os_icons/so_other.png
	images/os_icons/so_hpux.png
	images/os_icons/network.png
	images/os_icons/embedded.png: Reduce the operating 
	system icons size

	* images/vnc.png
	images/op_inventory.png
	images/refresh_mc.png
	images/heart.png
	images/service.png
	images/go.png
	images/graphmenu_arrow_hide.png
	images/submenu_tree_first.png
	images/config_mc.png
	images/cross_double.png
	images/wand.png
	images/expand.png
	images/submenu_tree_middle.png
	images/visual_console.png
	images/down.png
	images/chart_curve_threshold.png
	images/people_1.png
	images/cancel.png
	images/graphmenu_arrow.png
	images/people_2.png
	images/collapse.png
	images/camera_mc.png: Improve a lot of
	icons





git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8198 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-05-23 15:42:32 +00:00
mdtrooper 87d3a9d416 2013-04-23 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_filemanager.php: fixed the javascript to show
	the controls to upload file, create directory and create text file.
	
	Fixes: #3611231




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8033 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-04-23 13:30:38 +00:00
slerena 0dd04ce0ea 2013-02-26 Sancho Lerena <slerena@artica.es> 
* include/functions_filemanager.php: Fixed tooltips to use new
        format.  Added space between action icons.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7727 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-02-26 20:08:39 +00:00
mdtrooper 4806587a80 2013-02-14 Miguel de Dios <miguel.dedios@artica.es> 
* include/constants.php: added constant dir for the mibs of snmp.
	
	* include/functions_filemanager.php: cleaned source code style.
	
	* operation/snmpconsole/snmp_mib_uploader.php: fixed to avoid go
	upper directory to the mibs.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7654 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-02-14 15:03:07 +00:00
mdtrooper fd549b9324 2012-12-17 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/setup/file_manager.php, include/functions_filemanager.php:
	some fixes and added support for the metaconsole.
	
	* include/get_file.php: fixed lost check "is_user".
	
	* operation/netflow/nf_live_view.php: cleaned source code style.
	
	* include/functions_config.php: added check the flag of "is_admin"
	when try to change some config from setup.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2012-12-17 13:44:28 +00:00
mdtrooper 16324125b9 2012-10-26 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_api.php: fixed the function
	"api_set_apply_all_policies".
	
	Fixes: #3576289
	
	* include/functions.php, include/functions_filemanager.php: cleaned
	source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7099 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2012-10-26 17:37:57 +00:00
mdtrooper 9cde128f7c 2012-07-24 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/servers/manage_recontask_form.php,
	godmode/alerts/configure_alert_compound.php,
	godmode/modules/manage_network_components.php,
	include/functions_ui.php, include/functions_incidents.php,
	include/functions_agents.php, include/functions_alerts.php,
	include/functions_messages.php, include/db/mysql.php,
	include/functions_reporting.php, include/functions_filemanager.php,
	include/auth/ldap.php, operation/events/events.php,
	operation/incidents/incident_detail.php, operation/tree.php,
	operation/agentes/estado_agente.php, operation/agentes/sla_view.php,
	operation/users/user_edit.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6798 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2012-07-24 08:54:40 +00:00
mdtrooper 440a1e9591 2012-07-13 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/snmpconsole/snmp_alert.php,
	godmode/servers/manage_recontask_form.php,
	include/functions_filemanager.php, include/functions_networkmap.php,
	include/constants.php, include/graphs/functions_gd.php,
	include/graphs/functions_pchart.php,
	operation/events/events_list.php, operation/agentes/graphs.php,
	operation/agentes/networkmap.php, operation/agentes/stat_win.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/networkmap.groups.php,
	operation/gis_maps/render_view.php: cleaned source code style and
	change magic numbers for time constants.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6769 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2012-07-13 10:59:40 +00:00
mdtrooper 412ddf8cdb 2012-06-20 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_ui.php,
	extensions/update_manager/lib/functions.php: uploaded lost changes.
	
	* include/functions_filemanager.php: cleaned source code style.
	
	* include/functions.php: added function "copy_dir" for use in the
	bug #3527247.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6627 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2012-06-20 15:43:41 +00:00