Commit Graph

57 Commits

Author SHA1 Message Date
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin 68ac02db70 fix api function show graph 2020-11-20 13:01:47 +01:00
fbsanchez 80015a8691 smart services API adjustments 2020-07-07 10:21:28 +02:00
Jose Gonzalez 1fd19802ac Added api function for update events 2020-06-12 14:11:41 +02:00
fbsanchez 9edb77d288 proper logout (api) 2019-10-22 20:48:45 +02:00
fbsanchez ccfd944ad7 Fix and control API sessions
Conflicts:
	pandora_console/include/lib/User.php

	modified:   pandora_console/include/api.php
	modified:   pandora_console/include/chart_generator.php
	new file:   pandora_console/include/lib/User.php
	modified:   pandora_console/include/load_session.php
	modified:   pandora_console/include/web2image.js
2019-10-22 17:33:50 +02:00
marcos.alconada e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
marcos.alconada 062a68fdaf Ultimas modificaciones
Former-commit-id: fb7686f1f75c0d033c40d866d777d10f993a9e36
2019-04-24 12:01:04 +02:00
marcos.alconada 58d2abbdae restauro api
Former-commit-id: de9d1588e0e8ef53b48b72d52597963b59aee11f
2019-04-23 15:37:54 +02:00
marcos.alconada 6f709cbae3 Retoque en api php
Former-commit-id: 46f5c90f6715083afb22c757e1e45a00c0f4381a
2019-04-17 17:28:48 +02:00
marcos.alconada ad4dfc7624 Codigo normalizado, se cambian las llamadas y los datos de entrada a los metodos mediante other
Former-commit-id: 13478c483108b878a4cdc25bf19663bf8ed7d0af
2019-04-17 17:25:25 +02:00
marcos.alconada 51541c8d2c Atucalizacion de rama
Former-commit-id: 0b31052bc4b69d12840b0bac70e06ff222142c07
2019-04-17 15:06:25 +02:00
marcos.alconada 985726d5a2 modificaciones en api.php
Former-commit-id: f46abc58c079fbe584d2bda12f44e3b09c1a4693
2019-04-17 12:44:23 +02:00
marcos.alconada 985fc952e1 actualizacion
Former-commit-id: 238764c594de2680d5f0c76a9c1b5fc7d8b8579d
2019-04-16 16:10:25 +02:00
marcos.alconada 31aa5b6d67 Comprobaciones en local
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
2019-04-16 16:06:17 +02:00
marcos.alconada 83934100ef change api
Former-commit-id: 064e8e8cdc1fae50424ca6a1796b27490970c084
2019-04-16 09:24:11 +02:00
marcos.alconada 86ff1accbd Sintax problems resolved on Api.php
Former-commit-id: e42cbd99938e57abad1ea4e9c76ddeedb9e0cc01
2019-04-15 17:18:16 +02:00
marcos.alconada 28eae48a9e Changed sintaxis
Former-commit-id: 4011dbcba98ad59e7a152e2e3e87c6ae8d646a85
2019-04-15 15:51:01 +02:00
marcos.alconada 994424fe52 Functions changed
Former-commit-id: 7eb0fb25ec863df6c60ed88bf84a6f5db5c90979
2019-04-15 12:19:35 +02:00
marcos.alconada ddfd3339ff add api
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
marcos.alconada e163c27b43 Commit para revisar progreso
Former-commit-id: 498b7c6a44a18c075c431853d8bf6875e92945f9
2019-03-25 17:59:12 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
Alejandro Gallardo Escobar 2778239a0f Fix the api info call 2018-08-07 13:03:53 +02:00
Alejandro Gallardo Escobar f4f298ebf9 Remove html encoded characters from the product name when returning the info using the API 2018-07-30 16:38:18 +02:00
daniel 80ddcbe1b6 fixed security error phantomjs 2018-06-14 16:47:23 +02:00
Fermin 9bf6102ac6 [ACL API] Added ACL in some set functions 2018-06-07 19:45:54 +02:00
fermin831 8a1f5c87ec [Rebranding] Open API 2018-05-10 18:56:59 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
enriquecd 8690aa908a Cluster monitoring 2 - #2007 2018-03-19 10:05:29 +01:00
vgilc 5335b69b61 Merge branch '1776-3833-no-aparecen-eventos-en-la-aplicacion-de-android-v6' into 'pandora_6.0'
Resolve "[ #3833] No aparecen Eventos en la aplicación de android v6"

See merge request artica/pandorafms!1352

(cherry picked from commit 6b7a22e47c)

c7e7ea1e Removed unwanted output from the api.php responses
2018-03-07 16:54:18 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez c29cc92587 Rolling release in progress... (Alert when minor release are available) 2016-06-01 10:43:22 +02:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
slerena 46164b984e 2013-12-26 Sancho Lerena <slerena@artica.es>
* include/api.php: Avoid to store API auth failure in
        session log to avoid DoS due high volume of transactions.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9262 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-12-26 18:55:56 +00:00
zarzuelo a7d3ad065d 2013-11-05 Sergio Martin <sergio.martin@artica.es>
* include/api.php: Create a special call on Pandora FMS
	API to verify if it is a correct installation of Pandora 
	and get the Version.
	This call only retrieve "Pandora FMS [version] - [build]"
	without any security check.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9008 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-05 17:23:13 +00:00
mdtrooper 1cbf6978da 2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* include/api.php: checking the update manager, sorry.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8927 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 14:13:53 +00:00
mdtrooper c7e78e0190 2013-07-30 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/networkmap.php, godmode/users/user_list.php,
	include/javascript/pandora.js,
	include/javascript/openlayers.pandora.js,
	include/functions_snmp_browser.php, include/api.php,
	include/functions_api.php, operation/snmpconsole/snmp_browser.php,
	operation/agentes/networkmap.dinamic.php: improved the source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8596 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-30 10:25:49 +00:00
mdtrooper 0fd149893e 2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_incidents.php, include/api.php,
	include/functions.php, include/functions_modules.php,
	include/graphs/flot/pandora.flot.js, include/functions_cron.php,
	include/functions_graph.php: improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8140 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-16 09:19:16 +00:00
slerena 3e46f8fa34 2013-02-22 Sancho Lerena <slerena@artica.es>
* include/api.php: Added a single protection on DoS attacks.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7704 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-22 13:31:29 +00:00
mdtrooper e77d6879a0 2012-08-22 Miguel de Dios <miguel.dedios@artica.es>
* include/api.php: cleaned source code style.
	
	* include/auth/mysql.php: fixed the access users in the api with or
	without no_login field set.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6904 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-08-22 15:11:44 +00:00
mdtrooper cf3b29f546 2012-08-20 Miguel de Dios <miguel.dedios@artica.es>
* index.php, extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	general/login_page.php, general/logon_failed.php,
	godmode/users/configure_user.php, include/api.php,
	include/auth/mysql.php, pandoradb.sql, pandoradb.postgreSQL.sql,
	pandoradb.oracle.sql: added the feature to set any user with
	"not login" for only the user can work across the API.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6891 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-08-20 18:06:04 +00:00
zarzuelo aaf245c9d4 2012-06-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php
	include/api.php: Change the names of the functions_api
	functions with prefix 'api_' for security. Improve
	the wildcards of the ACL's IP list to allow place 
	wilcard anywhere. Add to API the possibility 
	of be extended from extensions.
	MERGED from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6551 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 15:07:40 +00:00
zarzuelo 677f5c017b 2012-06-14 Sergio Martin <sergio.martin@artica.es>
* include/api.php: Change the security checks adding
	a new parameter to API pass
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6549 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-14 11:59:10 +00:00
mdtrooper 2f6aa54e9c 2012-04-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php, include/api.php: fixed when some error
	in get_events__user, and added constants flags for debug in the
	header of source file.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6170 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-25 18:09:05 +00:00
mdtrooper d7b6cbe8db 2012-02-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed into function "get_events__with_user"
	when try get list events when empty list of groups for user.
	
	* include/api.php: fixed the auth.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 17:21:11 +00:00
mdtrooper 8de3c37f5c 2011-09-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: added api call "set_validate_event".
	
	* include/api.php: fixed the login process for do more Pandora standar.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4997 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-25 17:26:36 +00:00
mdtrooper 4f387f5c1b 2011-09-12 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php, include/api.php: added the code for to
	extract events in the android event viewer.

	* operation/events/events_list.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4937 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-09-12 11:28:32 +00:00