summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* #1061 add timeout to pending scheduled commandsJose M. Guisado2021-09-063-0/+14
| | | | | | | | | | | Pending schedule commands can deny ogLive boot of clients due to filling of pending cmd queue with commands such as "Iniciar Sesión". For example: Using RemotePC to serve clients that do not boot into ogLive will fill up the pending command queue with "Iniciar Sesión". Introduce a safety timeout for pending (scheduled) commands to avoid this situation.
* #981 Use 'Wants' for mysql systemd unit dependencyJose M. Guisado2021-07-271-1/+1
| | | | | | | | | | | Unnattended upgrades from Ubuntu can cause a stop and start of mysql service, this in turn makes ogserver go down. Avoid ogserver shutting down when mysql does. It's not necessary, ogserver can report if it can't connect to the database. 'Wants' declare a weak dependency as described in https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
* #1054 Fix og_legacy_partition code buffer sizeJose M. Guisado2021-07-261-1/+2
| | | | | | | | | | | The "code" member of the og_legacy_partition is used to hold the string of the partition type *name* for legacy parameter strings. Example: par=2*cpt=LINUX-SWAP*sfi=LINUX-SWAP*tam=10000000*ope=0 Problem: Buffer size is smaller than possible values for this member. Fix: Increase buffer size up to the max length defined in the DB for the corresponding column.
* #1051 Initialize task_id once in og_cmd_post_schedule_commandJose M. Guisado2021-07-221-7/+7
| | | | | | | | Fixes task_id re-initialization in commit 33d8cecfe. Task id is to be initialized with the "session" value and can be done out of the for loop it was before. Avoiding unnecesary snprintf's with the same value.
* #1052 Populate session column when adding actionsJose M. Guisado2021-07-222-3/+14
| | | | | | | | | | | | | | | | If the scope of a command, procedure or task is related to a group of computers then actions associated with that schedule can share the same session value. og_dbi_add_action was not initializing session value, as it is only used for visualization purposes in the legacy web interface. This patch enables og_dbi_add_action to populate session column by assigning it the id value of the first action related to the scope. Example: Power off command for a room scope of 4 clients will result in 4 actions, a power off for each client. The first action id will determine the session value for the rest.
* #1051 Fix command schedule for several clientsJose M. Guisado2021-07-211-3/+24
| | | | | | | | | | | | | A single command can be schedule for several clients. Commit 141b0797e1 introduces a regression when scheduling a command for several clients, the command only executes successfuly for the first one. Fix it by reintroducing the usage of the 'session' column to group a single command into several actions (one for each client), the web console interface already expects this 'session' column to be set accordingly.
* #915 Add POST /task/add methodJavier Sánchez Parra2021-07-013-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the possibility to create a task with procedures and other tasks integrated as steps. Note: "steps" parameter is optional and "steps" array object order defines execution order. Request: POST /task/add { "center": "1", "name": "task", "description": "My task", "steps": [ { "procedure": 4 }, { "task": 1 }, { "procedure": 24 } ] } Response: 200 OK This commit also add task case to procedure's step processing. Otherwise, gcc prints the following warning: src/rest.c: In function ‘og_procedure_add_steps’: src/rest.c:4089:17: warning: enumeration value ‘OG_STEP_TASK’ not handled in switch [-Wswitch] 4089 | switch (step->type) { | ^~~~~~
* #915 Add POST /procedure/update methodJavier Sánchez Parra2021-06-291-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the possibility to update a procedure with commands and other procedures integrated as steps. Note: "steps" parameter is optional and "steps" array object order defines execution order. Also, if the body has empty steps, the procedure loses its previous steps. Request: POST /procedure/update { "procedure": "34", "center": "1", "name": "procedure-edited", "description": "My procedure edited", "steps": [ { "command": "wol", "params": { "type": "broadcast" } }, { "procedure": 24 }, { "command": "reboot", "params": {} } ] } Response: 200 OK
* Fix procedure id retrieving in steps creationJavier Sánchez Parra2021-06-291-3/+2
| | | | | | Otherwise, procedure id is always zero. Fixes: 1fdb7e6d1cf0709b1079b2d9990c0d53d8740461
* #915 Filter queued commands by idJavier Sánchez Parra2021-06-161-1/+1
| | | | | | | | | | | | ogServer searches queued commands (formerly actions) in the DB by session. This can lead to problems because session is not an uniquely identifier but an identifier that several commands can share to group them. This commit changes query filter from session to id, ensuring correct results This reverts commit d9b6aadf66655a6713bcacb25d2ea6b01c07e3b5.
* #915 Add POST /procedure/run methodJavier Sánchez Parra2021-06-151-0/+97
| | | | | | | | | | | | | | | | | | | Add ogServer support procedure execution. Now users can send a procedure and a list of clients to ogServer, then ogServer breaks down the procedure into commands (formerly actions) and queues them for each indicated client. TODO: Do not reply 200 OK when the procedure do not exist. Request: POST /procedure/run { "clients": ["192.168.56.11", "192.168.56.12"], "procedure": "33" } Response: 200 OK
* #915 Add procedure/deleteJose M. Guisado2021-06-111-0/+62
| | | | | | | | | | | | Delete operation for procedures stored in the database. POST /procedure/delete { "id": "7" } If no procedure is found returns 200 OK but a syslog call is issued to warn so. Such behavior will likely change in the future.
* #915 Revert filtering actions by id to "sesion" in og_dbi_queue_commandJose M. Guisado2021-06-101-1/+1
| | | | | | | | | | | | | | Commit 141b079 introduced a slight change in how rows from table "acciones" are filtered when queuing a command, from "sesion" column to "idaccion" column. This seemed reasonable, as id column is the one autoincrementing. But remotepc queued commands inserting actions id using a timestamp instead of the action row id. See https://github.com/opengnsys/OpenGnsys/blob/c17ffa5d032a82e8eca61481dd8a8adb8b3fc5b1/admin/WebConsole/rest/remotepc.php#L188 Revert said change as long as remotepc keeps such behavior.
* constify json parse helper functionOpenGnSys Support Team2021-06-102-10/+10
| | | | | json_t * parameter is not modified, constify to allow compiler to spew warnings in case the function tries to modify it.
* move json function declarations to json.hOpenGnSys Support Team2021-06-102-4/+4
| | | | | | | | These function declarations belong to json.h: int og_json_parse_partition_setup(json_t *element, struct og_msg_params *params); int og_json_parse_create_image(json_t *element, struct og_msg_params *params); int og_json_parse_restore_image(json_t *element, struct og_msg_params *params);
* #915 Add commands and procedures to procedure creationJavier Sánchez Parra2021-06-104-4/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the possibility to create a procedure with commands and other procedures integrated as steps. Note: "steps" parameter is optional and "steps" array object order defines execution order. Request: POST /procedure/add { "center": "1", "name": "procedure", "description": "My procedure", "steps": [ { "command": "wol", "params": { "type": "broadcast" } }, { "procedure": 22 }, { "command": "poweroff", "params": {} } ] } Response: 200 OK This commit also updates unit tests for /procedure/add POST method to include steps.
* missing copyright header to new src/legacy.c fileOpenGnSys Support Team2021-06-091-0/+9
|
* #915 Add schedule/commandJose M. Guisado2021-06-096-10/+497
| | | | | | | | | Enables ogserver to schedule commands (also referred as actions in legacy web console jargon). This feature enables ogserver to write in the "acciones" table in order to have full capabilities for command scheduling purposes, thus not depending in the legacy web console to insert into "acciones" table.
* #941 Free dbi_inst when og_dbi_open fails to connectJose M. Guisado2021-06-011-0/+1
| | | | | | | | | | When trying to open a connection to a database, an instance of libdbi is created before any connection attempt. If connection is unsuccessful then the og_dbi struct is freed but not the libdbi instance member, thus leaking its memory. Use libdbi dbi_shutdown_r to shutdown libdbi instance member before freeing og_dbi struct inside og_dbi_open.
* #942 Add POST /procedure/add methodJavier Sánchez Parra2021-05-312-0/+129
| | | | | | | | | | | | | | | | | | | | | | This method adds a procedure associated with a center to the database. Required payload parameters are center and name, description is optional. Note: ogServer does not allow to add more than one procedure with the same name and center. Request: POST /procedure/add { "center": "1" "name": "procedure1" "description": "My procedure" } Response: 200 OK This commit also adds unit tests for /procedure/add POST method.
* #1042 fix multiple definition of ogconfigOpenGnSys Support Team2021-05-271-2/+0
| | | | | | /usr/bin/ld: src/schema.o:/home/soleta/opengnsys/ogServer/src/schema.c:50: multiple definition of `ogconfig'; src/main.o:/home/soleta/opengnsys/ogServer/src/main.c:31: first defined here collect2: error: ld returned 1 exit status make: *** [Makefile:411: ogserver] Error 1
* #1037 Simplify database update v3 codeJavier Sánchez Parra2021-05-271-15/+8
| | | | | | Simplify database update v3, no need for iteration. Fixes: 12d8fff (#1037 Add disk type)
* #1037 Add disk typeJavier Sánchez Parra2021-05-265-8/+57
| | | | | | | Add ogServer support for parsing and storing in the DB disk type data from ogClient refresh response. See also commits with #1037 in ogClient and WebConsole repo.
* #1037 Make partition parameter validation permissiveJavier Sánchez Parra2021-05-261-1/+1
| | | | | Otherwise, ogServer rejects the response if ogClient sends more parameters than required.
* Add REST POST /room/delete methodJavier Sánchez Parra2021-05-101-0/+59
| | | | | | | | | | | | | | | | | This method deletes a room (lab) from the DB and deletes on cascade computers and computers partitions. Note: if the room id do not exists in the database, ogserver still tries to delete it and replies with 200 OK. Request: POST /room/delete { "id": "1" } Response: 200 OK
* #942 Add REST POST /center/delete methodJavier Sánchez Parra2021-05-101-0/+59
| | | | | | | | | | | | | | | | | This method deletes a center from the DB and deletes on cascade rooms/labs, computers and computers partitions. Note: if the center id do not exists in the database, ogserver still tries to delete it and replies with 200 OK. Request: POST /center/delete { "id": "1" } Response: 200 OK
* #980 ignore unknown attributesOpenGnSys Support Team2021-05-041-14/+0
| | | | If ogClient sends an unknown attribute, ignore it.
* #995 Add link speed parsing to client probe responseJose M. Guisado2021-05-043-0/+8
| | | | | | If a probe response contains speedinformation, parse and store it inside the client struct. Speed is interpreted as an unsigned integer representing Mbit/s.
* ogServer is AGPLv3+OpenGnSys Support Team2021-05-0411-22/+33
| | | | Update license header in files.
* #915 only API REST is supportedOpenGnSys Support Team2021-05-042-7/+3
| | | | Socket hidra API has been removed, all connections use a REST API.
* #580 remove old keepalive codeOpenGnSys Support Team2021-05-042-24/+2
| | | | Needed by the old socket Hydra that does not exist anymore
* #1043 don't create wol entries when client is connectedJose M. Guisado2021-04-291-0/+3
| | | | | | | | | | | | Avoids multiple entries of a same client like {"clients": [{"addr": "192.168.2.230", "state": "WOL_SENT"}, {"addr": "192.168.2.230", "state": "OPG"}] These can arise when ogserver processes a WoL request for an already connected client. When processing the WoL request, search for the target address in the clients list, if found we avoid creating the wol entry.
* #1043 add WOL_SENT stateOpenGnSys Support Team2021-04-294-1/+138
| | | | | WOL_SENT tells that WakeOnLan was sent to computer, after 60 seconds, if computer does not boot, this state is released.
* #1043 add function to append client to json treeOpenGnSys Support Team2021-04-291-18/+28
| | | | og_json_client_append() adds a client objet to the json tree.
* #1042 Add schema version 2Jose M. Guisado2021-04-281-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add foreign keys (version 1 introduced innoDB as default db engine) allowing cascade deletions for some tables: - perfilessoft_softwares If a software profile or a software component is deleted, the corresponding row in this table will be deleted too. - ordenadores_particiones If a computer or a partition is deleted from the DB, delete the corresponding row inside this table. - aulas If the center the room is in is removed, delete the room too. - ordenadores If the room in which a computer is in is removed, the computer will be deleted accordingly. We should take into account that this schema superseeds some code regarding deletions inside WebConsole that probably are not needed any more, at least for the tables mentioned. (See admin/WebConsole/gestores/relaciones/*.php in OpenGnsys repo)
* #980 Broken TCP connection times out after 120 seconds through keepaliveOpenGnSys Support Team2021-04-221-0/+12
| | | | | Enable TCP keepalive to detect if the ogClient is gone (hard reset). If no reply after 120 seconds, then release the connection to the client.
* #915 Add /room/add POST methodJavier Sánchez Parra2021-04-203-0/+183
| | | | | | | | | | | | | | | | | | | | | | | Adds POST method to add rooms (labs), required payload parameters are name, netmask and center; any additional attributes are optional. Required JSON: { "center": 0, "name": "classroom10", "netmask": "255.255.255.0" } Full JSON: { "center": 0, "name": "classroom11", "netmask": "255.255.255.0", "group": 0, "location": "First floor", "gateway": "192.168.56.1", "ntp": "hora.cica.es", "dns": "1.1.1.1", "remote": True } This commit also adds unit tests for /room/add POST method.
* #1042 Update database schema automaticallyJose M. Guisado2021-04-204-0/+165
| | | | | | | | | | | | | | | This patch adds database schema management capabilities to ogServer: - ogServer now tracks the version of its database schema, if no version is detected, creates a 'version' table with a single row starting at 0. - ogServer can upgrade its database schema to a newer version if detected. (ogServer ships required SQL commands to do so) If ogServer is unable to upgrade the schema at startup (if needed be) it *will not* start. Defines schema update v1 which upgrades database engine tables of ogServer database (usually named 'ogAdmBD') from myISAM to innoDB.
* #915 Add large HTTP response testJavier Sánchez Parra2021-04-193-1/+69
| | | | | | | | This commit adds a test for HTTP responses that are too large to fit in ogServer response buffer. It also moves the basic sql data used for the other tests to its own file, easing its reuse in several files.
* #915 Stop ogServer service in run-test.pyJavier Sánchez Parra2021-04-191-0/+3
| | | | | | | | | | Python test script launches its own ogServer to run tests. If there is another ogServer running at the same time, it interferes with tests. Installing ogServer in a machine results in an enabled ogServer service. Stop ogServer service before tests just in case the user installed ogServer in the machine.
* #915 increase maximum API REST response sizeJavier Sánchez Parra2021-04-191-1/+1
| | | | | GET /scope could generate a response larger than 64 Kbytes. Rise the maximum API REST response size to 256 Kbytes.
* #915 fix "response too large" error pathJavier Sánchez Parra2021-04-191-12/+9
| | | | | Otherwise, ogServer sends "200 OK" after a "500 Internal Server Error error" response.
* #915 validate response json sizeJavier Sánchez Parra2021-04-191-15/+65
| | | | | | | | Otherwise, copying response json to response buffer could lead to stack smashing is the json response is too large. stdout example: *** stack smashing detected ***: <unknown> terminated
* #971 Remove sql bottleneck when removing software profilesJose M. Guisado2021-04-161-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several universities have reported that creating a software profile hangs the machine running the ogServer for a while, sometimes up to minutes. Legacy SQL code is producing said bottleneck, responsible for pruning a intermediate table between "perfilessoft" and "softwares". There is redundant code, "perfilssoft" should be pruned first, speeding up the later task of pruning the intermediate table "perfilessoft_softwares" There is no need to execute: DELETE FROM perfilessoft_softwares WHERE idperfilsoft IN ( SELECT idperfilsoft FROM perfilessoft WHERE idperfilsoft NOT IN ( SELECT DISTINCT idperfilsoft from ordenadores_particiones) AND idperfilsoft NOT IN ( SELECT DISTINCT idperfilsoft from imagenes)) When afterwards "perfilessoft" is going to be pruned and "perfilessoft_softwares" pruned again: DELETE FROM perfilessoft WHERE idperfilsoft NOT IN (SELECT DISTINCT idperfilsoft from ordenadores_particiones) AND idperfilsoft NOT IN (SELECT DISTINCT idperfilsoft from imagenes) DELETE FROM perfilessoft_softwares WHERE idperfilsoft NOT IN (SELECT idperfilsoft from perfilessoft) The two latter commands suffice. This should not happen when using a relational database supporting foreign keys and ON DELETE CASCADE, like innoDB, which will be adopted soon.
* schedule: fix daylight saving problem with mktime()Jose M. Guisado2021-04-121-0/+3
| | | | | | | | | | | | | | | | | mktime modifies the struct tm it receives and takes into account whether DST is active or not (tm_isdst). tm_isdst == 0 adjusts the time, which causes the time mismatch error. All fields are being initialized to 0 and therefore it is assumed that the time that has been passed is not in daylight saving time. When the value is negative in tm.tm_isdst it delegates to mktime to guess if it is in daylight saving time or not, this works 99% of the time. Best way would be that ogserver knows what is its timezone and when daylight saving applies, so tm_isdst is set to 0 or 1 accordingly. Meanwhile, "tm_isdst = -1" provides the hotfix.
* #915 Add /center/add POST methodJose M. Guisado2021-04-082-0/+85
| | | | | | | | | Adds POST method to add centers (organizational unit), required payload parameter is the name, and an additional comment is optional. {"name": "ACME"} {"name": "ACME", "comment": "Some comment"}
* #915 Avoid duplicate db entries in /create/imagev1.2.0Jose M. Guisado2021-04-061-0/+18
| | | | | | | | | | /create/image adds an entry to the database for the given partition image created when payload contains a "description" attribute. This insertion into the database is lacking a check for duplicates, which are not supported for the images table. Add a prior duplicate check before inserting. Exit with -1 code if an image with the same name is found.
* #915 Add GET /oglive/test REST API functionJavier Sánchez Parra2021-04-052-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function returns the installed and available ogLiveS in the server to be booted from. Request: GET /oglive/list NO BODY Response 200 OK { "oglive": [ { "distribution": "bionic", "kernel": "5.4.0-40-generic", "architecture": "amd64", "revision": "r20200629", "directory": "ogLive-5.4.0-r20200629", "iso": "ogLive-bionic-5.4.0-40-generic-amd64-r20200629.85eceaf.iso" }, { "distribution": "bionic", "kernel": "5.0.0-27-generic", "architecture": "amd64", "revision": "r20190830", "directory": "ogLive-5.0.0-r20190830", "iso": "ogLive-bionic-5.0.0-27-generic-amd64-r20190830.7208cc9.iso" } ], "default": 0 } This commit also adds tests for GET /oglive/test.
* #1004 Add GET /images testDiego Crespo Quinta2021-03-302-1/+26
| | | | Fix incorrect error if json is missing.
* #990 fix crash in wol with malformed IP addressOpenGnSys Support Team2021-03-301-1/+4
| | | | | | | | | | | | | | | | | | ==28831== 1 errors in context 1 of 2: ==28831== Invalid read of size 1 ==28831== at 0x55AC6FD: inet_aton (inet_addr.c:127) ==28831== by 0x10ECCA: WakeUp (ogAdmServer.c:337) ==28831== by 0x10EED6: Levanta (ogAdmServer.c:292) ==28831== by 0x11651E: og_cmd_wol (rest.c:498) ==28831== by 0x11651E: og_client_state_process_payload_rest (rest.c:3970) ==28831== by 0x110CF3: og_client_read_cb (core.c:143) ==28831== by 0x4E41D72: ev_invoke_pending (in /usr/lib/x86_64-linux-gnu/libev.so.4.0.0) ==28831== by 0x4E453DD: ev_run (in /usr/lib/x86_64-linux-gnu/libev.so.4.0.0) ==28831== by 0x10E3E5: ev_loop (ev.h:835) ==28831== by 0x10E3E5: main (main.c:100) ==28831== Address 0x0 is not stack'd, malloc'd or (recently) free'd Use number of matching ip addresses in the database, skip if zero.