3476 Commits (b5cedff911ea9f2c7995a1920850f235b696ef0d)

Author	SHA1	Message	Date
Kirill Solomko	b5cedff911	Revert "TT#134254 change fax destination email field type" ... This reverts commit 7e6c05f097. Change-Id: I65793f35d35a7119725f3840d302c37ddc0af587	5 years ago
Kirill Solomko	7e6c05f097	TT#134254 change fax destination email field type ... * Email field is now Text to work with scenarios when use_regex is enabled Change-Id: Ibd8d1932e8ed3bcec6c4a6a08cbc16e5a192a617	5 years ago
Alexander Lutay	8516d817c6	TT#141802 Add firmware 'tags' support for 'version' firmware endpoint ... Improve NGCP to return firmware using the 'Firmware tag' if not such 'Version' found: >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/version/10.12.22.1 > firmware 10.12.22.1 >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/version/tag1 > firmware 10.12.22.1 >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/version/10.32.1.0 > firmware 10.32.1.0 >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/version/mytag > firmware 10.32.1.0 Change-Id: Ie6a75d82887d4b9945a04e599991d8996ede00d6	5 years ago
Alexander Lutay	31d954dfa8	TT#141802 Add firmware 'tags' support for 'next' firmware endpoint ... Historically NGCP supported Firmware tags for endpoint 'latest' only: > http://<ngcp_fqdn>:<bootstrap_port>/device/autoprov/firmware/<mac>/from/<current_firmware_version>/latest/<tag> For example: NGCP has 7 firmwares configured for SNOM D715 with MAC 0004138aa403. For the simplicity let's call firmwares versions: 1, 2, 3, 4, 5, 6, 7. the firmwares '4' and '6' has the same tag 'mytag'. The latest firmware is firmware with id '7' and it has no tag set. The endpoint 'latest' gives access to firmware '6' only: >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/from/0/latest > firmware 7 >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/from/0/latest/mytag > firmware 6 This commit adds 'tags' support for enpoint 'next'. It allows to address the complete chain of firmwares using tags: >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/from/0/next > firmware 1 # the next firmware after version '0' is firmware '1' >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/from/0/next/mytag > firmware 4 # the next firmware after version '0' with tag 'mytag' is firmware '4' >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/from/2/next/mytag > firmware 4 # the same as above, the firmware after version '2' with tag 'mytag' is firmware '4' >> curl http://myserver.com:1445/device/autoprov/firmware/0004138aa403/from/4/next/mytag > firmware 6 # the next firmware after version '4' with tag 'mytag' is firmware '6' P.S. $tmp variable was not in use, removed. Also improve the 404 output for the 'tag' case. Change-Id: Ifb896e1aef7b57328ab6492236768bc15ca8cc9e	5 years ago
Alexander Lutay	b106891f68	TT#141802 Add MAC to default SNOM 'bootstrap' URL on SRAPS ... By default NGCP created bootstrap URL on SRAPS as: > http://ngcp.server.com:1445/device/autoprov/bootstrap/ while we need to append it with MAC at the end, as SNOM has device specific firmwares and NGCP need to know MAC to find the device model and return proper firmware to upgrade. The proper bootstrap URL is: > http://ngcp.server.com:1445/device/autoprov/bootstrap/{mac} After firmware upgrade SNOM device will connect to secure URL: > https://ngcp.server.com:1444/device/autoprov/config/{mac} P.S. re-using Panasonic approach for SNOM devices with a difference: Panasonic uses label '{MAC}' and SNOM uses '{mac}'. Change-Id: Ib1530f1adf1154deb5a8fb8a7d856810885f4736	5 years ago
Alexander Lutay	725cbfb741	TT#141802 Fix 'bootsrap' PBX devices config generation ... Otherwise PBX devices config geenration failed with error: > 500 - error creating template: > error processing template, type=undef, > info='Can't use string ("") as a HASH ref while "strict refs" > in use at /usr/share/perl5/NGCP/Panel/Template/Plugin/DeviceConfig.pm line 50. ' It happens because no preferences access defined for 'bootstrap' PBX access (port 1445), they are available for 'config' access only (port 1444). Change-Id: Id2c1478678265144b8ddb83504a0d3c9cec16563	5 years ago
Kirill Solomko	471b9fe861	TT#139550 fix ngcp-vmnotify system call to use the correct args ... * uuid arg is mandatory now and it is added to the ngcp-vmnotify invokation Change-Id: Ie36b06d7abf700fe65a965c0ea8dbe813dc4faa2	5 years ago
Flaviu Mates	9bb622a2bc	TT#117153 Improve /api/cfmappings performance ... * switch to 'populate' instead of using 'insert' for each destinations, sources, times, bnumbers, mappings and CF preferences * add API->check_patch_op_add_only - to check if the patch contains only "add" operations * improve /api/cfmappings, if all PATCH operations are "add" then the existing records are not fetched and not recreated, enabling very new mapping inserts Change-Id: I0b4e71565c11771026dbbc000aa57b2a613409fa	5 years ago
Donat Zenichev	7d13b498cc	TT#110302 Small mistake in the 'create_location' of kamailio utils ... In this commit: 79c0c9fe12 there was a mistake done, which needs to be fixed. Change-Id: Iefeebc8bae5ae3b4f58e0e7db01be71773fe973e	5 years ago
Donat Zenichev	79c0c9fe12	TT#110302 Kamailio utils, improve usage of RPC command 'ul.add' ... The latest version of the 'ul.add' RPC command of Kamailio has 11 parameters instead of 9, we have to fix that. Change-Id: Ic70bde77eada095ddf127e18f3ef7e5b3d91478f	5 years ago
Rene Krenn	b6e696621b	TT#132650 /api/provisioning_templates CRUD rail ... the /api/provisionintemplates rail provides the operations to create, edit and delete "provisioning templates" know from the "batch provisioning" feature of admin panel. these templates can also be defined in config.yml, while it is however only possible to edit templates stored in the database. executing a template and/or uploading a .csv for bulk execution will be available in a separate part. Change-Id: If8627327270edfce5bca1be3b1f777c1bd44e90f	5 years ago
Rene Krenn	51f548514a	TT#142001 do not quote LI numbers in Response err messages ... the G2k/LIMA implementation seems to have our error messages hardcoded in their logic. it stareted to fail since we added logline obfuscation, which was also added to response messages in this place. Change-Id: I36c2a74ed17db7013e692d7cbdccf0dbd44e814e	5 years ago
Alexander Lutay	1840af1eb2	TT#142402 Fix v1 'Back' button navigation on v2 (iframe inside iframe) ... The ngcp-panel v1 codebase uses 'back=' GET parameters to record all the navigation path and store it into the session array: '$c->session->{redirect_targets}'. On switch from v1 to v2 using the link 'GO TO NEW ADMIN PANEL', the function 'login_to_v2' is not using the concept of 'back=' GET param, but ngcp-panel still receives and stores the last value with 'empty' path: > $VAR1 = bless( do{\(my $o = 'https://x.x.x.x:1443/')}, 'URI::https' ); > $VAR2 = bless( do{\(my $o = 'https://x.x.x.x:1443/subscriber/155/details')}, 'URI::https' ); > $VAR3 = bless( do{\(my $o = 'https://x.x.x.x:1443/subscriber')}, 'URI::https' ); > $VAR4 = bless( do{\(my $o = 'https://x.x.x.x:1443/dashboard')}, 'URI::https' ); The navigation above is a recorded browsing path on v1 (in a reverse order): - login to ngcp-panel (dashboard page is opened), - open 'Subscribers' - open details for some subscriber with id 155 - open subscriber preferences - click on link 'GO TO NEW ADMIN PANEL'. As a result user is still located on the same page "Preferences", but not on v1 but v2 interface. The empty value is inserted into the array '$c->session->{redirect_targets}' (which is wrong). The empty path 'https://x.x.x.x:1443/' brakes v2 navigation for v1 'Back' button inside iframe. It causes loading of iframe inside iframe, which happens on v2 due to list of redirections: - clicking on v1 button 'back' inside v2 iframe requests https://x.x.x.x:1443/back - it triggers navigation to the top element array 'https://x.x.x.x:1443/' which is wrong/corrupted. - loading '/' cause 302 redirect to '/v2/' (as 'v2' is a default UI for mr10.0+) - loading '/v2/' inside iframe cause the issue with 'v2' content inside 'v2' iframe. This is a commit to prevent inserting an empty 'back_uri' into the session array '$c->session->{redirect_targets}'. Change-Id: I69df4320fa8cde4d23a7d9dd18ffb5eb06ee8df1	5 years ago
Alexander Lutay	3cc01922e7	TT#142402 Improve 'framed' session behaviour when users are using v1 and v2 in parallel ... The modern browsers (except Safari) supports 'Sec-Fetch-Dest': https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Sec-Fetch-Dest In theory we can remove the current 'framed session' storage completely, but Safari will not be supported. Let's expand the current logic to provide extra protection here to backport the commit to mr9.5+. Change-Id: I9c070f77f427c81581f4d9ceeb1a57b274d77819	5 years ago
Kirill Solomko	fc8a16859f	TT#66577 use kamailo ids for sems_registrations ... * kamailio.sems_registrations now uses kamailio.lcr_gw.id -> peer_host_id kamailio.subscriber.id -> subscriber_id for foreign keys consistency withing the same database Change-Id: I4722729fdee07eb2a153473e85d64faa46eedca5	5 years ago
Kirill Solomko	535c38cd93	TT#133800 fix webpassword, change subadmin expose password ... * webpassword is not correctly removed based on length, and remain visible when in plain-text or empty (unset) * config->security->password_(sip|web)_expose_subadmin now only affects subscribers under the same customer that are not this subscriber admin Change-Id: I329e0f1ad97dd513a33e3652ed03b4a43a95ed04	5 years ago
Donat Zenichev	f16a4e98de	TT#66577 Add a possibility to de-register on peering group deletion ... We need to de-register all subsequent peering hosts located under the peering group being deleted. Change-Id: I50bc25932e59d6b918f65c6525f2631cb9868fe4	5 years ago
Donat Zenichev	df30292c6b	TT#66577 Add support of outbound registrations for SIP peerings ... We need to add an improvement, which fulfills the work of the registration mechanism for SIP peerings. Not only do we add here a registration tirggering for peerings, but also a 'type' is introduced, which is mostly needed for XMLRPC commands being sent towards SEMS, to let it understand to whom the $sid is related to. Plus a list of improvements: - de-register peering host on deletion ; - de-register peering host on disable / register of peering host on enable ; Change-Id: I035dfadf6709acb4d106a70f6124f024e719044f	5 years ago
Victor Tsvetov	74db09a720	TT#137754 Disable future dates in Invoice Period ... When creating new Invoice don't allow picking a future date. Change-Id: I584e193b6882ecc3c9c3c9b8490c712906ee5076	5 years ago
Victor Tsvetov	3cb71e4ceb	TT#130456 API Customers POST: show error if system template ... Throw descriptive error for attempt to create Customer with Template that does not belong to Contact’s Reseller. Cover the case when the Template belongs to System Contact (with no Reseller). Error example: 'subscriber_email_template_id' with value '1' does not belong to Reseller '1' that is assigned to Customer's Contact '1' Change-Id: Iffcef0339afc4490ecba81d4667cbb9225766af4	5 years ago
Victor Seva	883cf884f2	TT#137602 prosody: domains are treated as lowercase ... Change-Id: I65af0765112cbf4ba52daf2baf28043197ebeae3	5 years ago
Victor Tsvetov	c9e56364a4	TT#137552 Update German translations ... Import new translations from Crowdin. 99% translated 81% approved Change-Id: I78db4d313fb1ae8481fe82a8aa15cf8bdedba8c5	5 years ago
Sipwise Jenkins Builder	b887138fdb	TT#4166 I18N dump: snapshot 2021.08.18-01.28.38 ... Change-Id: Id2c2f8d3c0b8ae0cc166ae8efb7650be93ce0e9b	5 years ago
Sipwise Jenkins Builder	5f2925cdb0	TT#4166 I18N dump: snapshot 2021.08.17-01.34.01 ... Change-Id: I96c8e4edf7683dcf61127b7e95a5632baa70e8e5	5 years ago
Rene Krenn	48f8938dfd	TT#134807 "ignore domain" option for billing profiles ... fee matching works in 2 attempts: 1. try to find a fee matching <user@domain> 2. if none found, try to find a fee matching <user> the billing_profile record will get a new field "ignore_domain". if set to "1", step#1 above should be skipped. Change-Id: I7f0a8f1dd8d5699ad4e2b8242c68fb9f75fc1bff	5 years ago
Kirill Solomko	992c9f1e48	TT#129162 Admins fix password field transformation ... * password field is virtual and needs to be transformed into saltedpass, restored the removed logic that does that in process_form_resource() Change-Id: I8baabbef2bdb46db850e12b6e0c638ca5c3deddf	5 years ago
Sipwise Jenkins Builder	6430645f34	TT#4166 I18N dump: snapshot 2021.08.10-01.27.27 ... Change-Id: I261d603764e0613c85b47dcede476310ff84fc86	5 years ago
Donat Zenichev	6a17151b1d	TT#133301 Adding default AA slot for timeout cases ... A feature request to have an opportunity to add a default action slot, in case a caller hangs on the AA and doesn't pick anything. Main change is related to sql structure of 'provisioning.voip_pbx_autoattendants' table, which now has 'voip_pbx_autoattendants.choice' as VARCHAR(16) instead of TINYINT. Also adding a label 'default' for the drop-down menu. Change-Id: I6382a68c8258094a2bf2bf9c71407092860f5e4d	5 years ago
Sipwise Jenkins Builder	35f7cdef24	TT#4166 I18N dump: snapshot 2021.08.06-01.23.29 ... Change-Id: I9388737087cb7cbb166ba279090ab95371fff1fd	5 years ago
Victor Tsvetov	0592f3f731	TT#126853 Replace "free minutes" with "free calling time" ... The value of "interval_free_time" preference is specified in seconds. To avoid confusion, use the term "free calling time" rather than "free minutes" in tooltips. Change-Id: Ia4bd507e4a2281723fd2168a34b2178bf404f867	5 years ago
Sipwise Jenkins Builder	0d3ea9cfe2	TT#4166 I18N dump: snapshot 2021.08.05-01.24.15 ... Change-Id: I36bb3a56a76c995db7e760994f663cbb2b832ef4	5 years ago
Kirill Solomko	cc10506b2e	TT#129162 fix subscriber webpassword field validation ... * 'webpassword' field is now also validated for invalid (non-ascii) characters * Fix multiple APP input field validation erros to comma joined. * Adjust 'webpassword' field validation errors to have better readability when there are multiple validation errors Change-Id: I21536f97a4da78cc5192a3abd8cd5adef1b819ec	5 years ago
Kirill Solomko	02f3f6b3a1	TT#133800 fix webpassword field removal ... * webpassword field was unconditionally deleted in API GET and DELETE methods, it now relies on resource_from_item for the common approach Change-Id: I703158fd2022b49a49470db28cb22f37e613f841	5 years ago
Kirill Solomko	3ef167575c	TT#133901 fix administrative flag for subscriberadmin ... * 'administrative' field is read only for susbcriberadmin role and that caused it to be removed from the final update 'resource', setting it to 0 if not existed. now the 'administrative' field is only changed in the database if it's defined in the 'resource'. Change-Id: I50738a77052c2163b19b2a42293c7a00e2780bc3	5 years ago
Kirill Solomko	c50b49db96	TT#133800 fix password fields behaviour in API ... * PATCH: password fields are not removed when resource is created for apply_patch(), they are removed under the same condititions later when hal is generated, that is to ensure that admin users without the 'show_passwords' flag as well as subscribers will not run into situation when they use PATCH and cannot apply it for "path": "/password" or/and "path": "/webpassword", as they were removed before apply_patch() * rework encrypted webpassword detection. webpasword is detected as encrypted if its length is 54 or 56 and it contains at least one '$' char, there is a chance for false positive detection when a user provides with a plain-text password with the same pattern but it's very unlikely, as well as since mr8.5 webpasswords are expected to be encrypted, and moreover worth case scenario is that the plain-text password will not be returned to the user Change-Id: I8ea739cbf728b2134f3ce00cee29da42ab3fb4a3	5 years ago
Victor Tsvetov	94c35307ab	TT#129160 Complete missing Russian translations ... Add missing translations. All are machine-translated and require later proofreading. Change-Id: I7abf1706591391f121a7d0a9d5a5a12922c837bb	5 years ago
Flaviu Mates	b4bc1f2a71	TT#133053 Fix 500 error on /api/authtokens ... * fix typo 'users' to 'user' and 'role' to 'roles' which were causing the Internal Server Error Change-Id: I3cabadafe34d66a429038dcd2c5b0de797cc6ef1	5 years ago
Kirill Solomko	2b144caf2c	TT#128605 implement dynamic fields expand ... * add API functionality to request additional data and expand fields in GET methods * syntax: - /api/resource/?expand=all - expands all expandable fields e.g.: customer_id field is expanded and customer internally is queried and returned under "customer" => {...} (the returned data is identical to what /api/customers/id would return) - /api/resource/?expand=reseller_id,customer_id - expands only reseller_id and customer_id fields, if they are expandable - /api/resource/?expand=reseller_id,invalidfield_id - returns the data and expands only fields that are expandable (reseller_id in this case) but if it finds either unknown fields or non-expandable fields, changes HTTP status code to "409 Conflict" * adapt all API endpoints to support dynamic expand fields expanding functionality, however the actual expand for them requires modifying the form fields in the following format: has_field 'contact_id' => ( element_attr => { expand => { class => 'NGCP::Panel::Role::API::CustomerContacts', id_field => 'contact_id', alias => 'contact', fetch => 0, }, }, ); - class - represents the class that should be used by the logic to fetch the relevant data - id_field - which field from the resource needs to be expanded, it should be the "id" field (subscriber_id, domain_id, etc.) - alias - (optional), under which key the fetched data is stored. the field name is used as the key if the option is omitted. - fetch - (optional), if the returned data is under $data->{contract_id} then it will be fetched from there and stored under the key (field name or alias), otherwise the whole retreived data is stored under the key (field name or alias) * adapt /api/autoattendants to use the new approach (old one was expand=1) * currently supported endpoints with expand: - admins - autoattendants - domains - customers - customercontacts - resellers - subscribers Change-Id: Iac53409dad944ed4794039a48dc3a9f6dce25bc1	5 years ago
Sipwise Jenkins Builder	f48ec2dfab	TT#4166 I18N dump: snapshot 2021.07.23-01.23.11 ... Change-Id: I69833ef40737c2963371468578fe2d605f568314	5 years ago
Kirill Solomko	1cdae0b1e0	TT#125902 add Login CSC v2 support ... * Login CSC v2 button is shown on the subscriber's master data page if www_admin.http_csc.csc_js_enable == 1 or 2 * When the login is triggered an auth token is generated internally followed by a redirect to CSC as /?a=auth_token * move generate_auth_token() into Utils/Auth * improve generate_auth_token() arguments support * add /api/authtokens error handling Change-Id: Idd65400bf8ce6ce48979c736f6a199fb567ffaa4	5 years ago
Alexander Lutay	12c2911fe4	TT#130659 Improve path debug output in panel-debug.log ... It is much more usable to see the debug information as URLs: > Jul 22 08:24:53 sp1 ngcp-panel: DEBUG: *** New GET request on path: / > Jul 22 08:24:53 sp1 ngcp-panel: DEBUG: *** New GET request on path: /subscriber > Jul 22 08:24:53 sp1 ngcp-panel: DEBUG: *** New GET request on path: /subscriber/ajax Instead of Catalyst oriented way: > Jul 22 08:24:53 sp1 ngcp-panel: DEBUG: *** New GET request on path: > Jul 22 08:24:53 sp1 ngcp-panel: DEBUG: *** New GET request on path: subscriber > Jul 22 08:24:53 sp1 ngcp-panel: DEBUG: *** New GET request on path: subscriber/ajax Change-Id: I38699152e232c5f5aa2ef218db9bf61c692bbf33	5 years ago
Sipwise Jenkins Builder	382ae285a9	TT#4166 I18N dump: snapshot 2021.07.21-01.32.54 ... Change-Id: I7a313e139a75933049712e8cfa661c82b7dcccea	5 years ago
Alexander Lutay	6fbf99e461	TT#130659 Improve debug log layout (common style, removing plus/star markers) ... It was close to impossible to read ngcp-panel debug log due to: * missing clear marker of the start reuqest processing, use '***' once only * some personal markers (like '+++++++') have been removed as they have no meaning for other developers. Let's remove the personal markers and work to make the panel debug log well readable for all developers. Change-Id: I69faff3ab2258fc156e88c7b8da0edfef14c3e6e	5 years ago
Alexander Lutay	6263f167e2	TT#130659 Stop calling systemd openvpn status twice on every HTTP request ... The ngcp-panel<=>openvpn functionality has never been finished but on every HTTP requset ngcp-panel was asking systemd about openvpn status. Twice! From /var/log/ngcp/panel-debug.log : > Jul 19 09:36:32 sp1 ngcp-panel: DEBUG: Path: dashboard > Jul 19 09:36:32 sp1 ngcp-panel: DEBUG: systemctl list-unit-files openvpn.service > Jul 19 09:36:32 sp1 ngcp-panel: DEBUG: systemctl is-enabled openvpn@ovpn > ... > Jul 19 09:36:33 sp1 ngcp-panel: DEBUG: Path: dashboard/ajax/peering_sum > Jul 19 09:36:33 sp1 ngcp-panel: DEBUG: systemctl list-unit-files openvpn.service > Jul 19 09:36:33 sp1 ngcp-panel: DEBUG: systemctl is-enabled openvpn@ovpn > ... > Jul 19 09:36:33 sp1 ngcp-panel: DEBUG: Path: dashboard/ajax/emergency_mode > Jul 19 09:36:33 sp1 ngcp-panel: DEBUG: systemctl list-unit-files openvpn.service > Jul 19 09:36:33 sp1 ngcp-panel: DEBUG: systemctl is-enabled openvpn@ovpn It is unnecessary load, moreover for not-yet finished feature. Let's move openvpn WIP functionality into 'NGCP Support Status' page and finish it there one day. The goal of this commit is to stop DOS'ing systemd. Change-Id: I6c9ba9e1b218e58b5adffe741f4490b3729d17e7	5 years ago
Kirill Solomko	fc9c71a88e	TT#130203 unify admin and subscriber JWT tokens ... * /login_jwt is now the only endpoint to issue JWT tokens * JWT token admin/subscriber is provided based on the NGCP_REALM/NGCP_API_REALM fcgi env values (e.g.: https://localhost:1443/login_jwt = admin JWT token and https://localhost/login_jwt = subscriber JWT token) * Authorization: Bearer a= prefix is deprecated * Clients cannot use subscriber JWT token to access admin NGCP_API_REALM https://localhost:1443/api/... and vice-versa Change-Id: I46edf4c7aaf7bb835dc4ac6b7535aa2d6b5ac136	5 years ago
Sipwise Jenkins Builder	181841eb50	TT#4166 I18N dump: snapshot 2021.07.19-01.22.52 ... Change-Id: I67dbf95faff4da11d44b0a26e7e5c97c2628d361	5 years ago
Victor Tsvetov	50f6b2af75	TT#115002 Add strings from Forms to i18n source ... Add strings that were collected by fixed ngcp_panel_dump_db_strings.pl from Forms into i18n source file messages.pot. Change-Id: I92157059b48bdfab94405b674f9a7300c5a9a91d	5 years ago
Victor Tsvetov	21bbb382d6	TT#115002 Fix collecting i18n strings from Forms ... Fix ngcp_panel_dump_db_strings.pl to load Forms modules properly. Make modules not to fail when they are called without ctx context. Change-Id: I695978b1831068f37198bce9f6a5b9e406d79ede	5 years ago
Sipwise Jenkins Builder	c6a6427ab9	TT#4166 I18N dump: snapshot 2021.07.17-01.23.06 ... Change-Id: Ib275a4657085d879fec6e5fe3ab1938deece46ff	5 years ago
Alexander Lutay	42e63e5711	TT#130659 Remove rrd-related ngcp-panel code ... Change-Id: I76880ba12037f1653c4c969e442738cc7f3eb185	5 years ago