Compare commits
67 commits
master
...
DSM7_dev_D
Author | SHA1 | Date | |
---|---|---|---|
Stephan | fbe28dfd07 | ||
Stephan | 40f996953f | ||
Stephan | 222fe5cc0e | ||
Stephan | 6ca83573e8 | ||
Stephan | 6cc6a5d635 | ||
Stephan | e5f277ead3 | ||
Stephan | 4e8954b596 | ||
Stephan | 965260e4dd | ||
Stephan | 6896447014 | ||
Stephan | 8634e7f388 | ||
Stephan | 411918e45f | ||
Stephan | f6b21bc606 | ||
Stephan | 8f3bb26b06 | ||
Stephan | bf44bf1548 | ||
Stephan | bcd0fbfcb2 | ||
Stephan | 81a58d04dd | ||
Stephan | 74e1a26c55 | ||
Stephan | 0514a8b493 | ||
Stephan | 56bc95b18e | ||
Stephan | 22de3dc069 | ||
Stephan | c69201f0d7 | ||
Stephan | f719a59635 | ||
Stephan | bd420c0176 | ||
Stephan | 36a1a5acbb | ||
Stephan | a41b9567e1 | ||
Stephan | 50ddb6f7a8 | ||
Stephan | 7d50e20b65 | ||
b47400f74a | |||
5f13833299 | |||
Stephan | 9e31705bd7 | ||
Stephan | a9df2878ce | ||
Stephan | d90762b2e1 | ||
Stephan | eb7a1175fa | ||
Stephan | 4b37a4647b | ||
Stephan | 39452335e4 | ||
Stephan | b9c50c712e | ||
Stephan | cc9de0349f | ||
Stephan | 542ad2e236 | ||
Stephan | d8565ff9e0 | ||
Stephan | 06fd4c4b46 | ||
Stephan | 43f1f566c3 | ||
Stephan | 5cd52cc795 | ||
Stephan | 220df4d148 | ||
Stephan | 9b1a8ed382 | ||
Stephan | c9d50df1ca | ||
Stephan | b44edfa1cc | ||
Stephan | d9687b9e01 | ||
Stephan | 293ea9cf9b | ||
Stephan | aa7bd7df81 | ||
Stephan | 4a46435149 | ||
Stephan | 7df13663c2 | ||
Stephan | 0235707664 | ||
Stephan | 9177406173 | ||
Stephan | a95c516c4a | ||
Stephan | 79397a932e | ||
Stephan | 6d1d4bfdb8 | ||
Stephan | 17ac0c3924 | ||
Stephan | e251f5e2d8 | ||
Stephan | e633afba1a | ||
Stephan | 39de209a17 | ||
Stephan | 12acdffaed | ||
Stephan | 1029b83a21 | ||
Stephan | 094b545a50 | ||
Stephan | badd5d4e05 | ||
b12c15a8de | |||
Stephan | cd24b30b2b | ||
Stephan | cb7a555a5d |
|
@ -1,6 +0,0 @@
|
|||
text = synOTR
|
||||
description = synOTR
|
||||
icon_16 = images/synOTR_16.png
|
||||
icon_32 = images/synOTR_32.png
|
||||
type = embedded
|
||||
path = /webman/3rdparty/synOTR/index.cgi
|
2
Build/bin/synOTR-cli
Normal file
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
/var/packages/synOTR/scripts/start-stop-status "$@"
|
19
Build/config
|
@ -1,19 +0,0 @@
|
|||
{
|
||||
".url": {
|
||||
"SYNO.SDS.synOTR.Application": {
|
||||
"type": "legacy",
|
||||
"allUsers": false,
|
||||
"allowMultiInstance": false,
|
||||
"grantPrivilege": "all",
|
||||
"advanceGrantPrivilege" : true,
|
||||
"configablePrivilege" : true,
|
||||
"title": "synOTR",
|
||||
"desc": "",
|
||||
"icon": "images/synOTR_{0}.png",
|
||||
"appWindow": "SYNO.SDS.synOTR.Application",
|
||||
"texts": "texts",
|
||||
"width": 960,
|
||||
"url": "/webman/3rdparty/synOTR/index.cgi"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,58 +0,0 @@
|
|||
<?PHP
|
||||
//***********************************************************************//
|
||||
// check_appprivilege.inc.php //
|
||||
// Description: Script to query the active user permission for the //
|
||||
// called application. //
|
||||
// This will allow control of the permissions for //
|
||||
// 3rdparty apps via Control Panel - Permissions //
|
||||
// Now with query from SynoToken (DSM 4.x and onward) //
|
||||
// Author: QTip from the german Synology support forum //
|
||||
// Copyright: 2014-2016 by QTip //
|
||||
// License: GNU GPLv3 (see LICENSE) //
|
||||
// Thanks to MrSandman (German Synology support forum) for the nudge in //
|
||||
// the right direction //
|
||||
// ------------------------------------------------------------------- //
|
||||
// Version: 0.31 - 18/09/2016 //
|
||||
//***********************************************************************//
|
||||
function check_privilege($appname) {
|
||||
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){
|
||||
$clientIP = $_SERVER['HTTP_X_FORWARDED_FOR'];
|
||||
} elseif (isset($_SERVER['HTTP_X_REAL_IP'])){
|
||||
$clientIP = $_SERVER['HTTP_X_REAL_IP'];
|
||||
} else {
|
||||
$clientIP = $_SERVER['REMOTE_ADDR'];
|
||||
}
|
||||
putenv('HTTP_COOKIE='.$_SERVER['HTTP_COOKIE']);
|
||||
putenv('REMOTE_ADDR='.$clientIP);
|
||||
$login = shell_exec("/usr/syno/synoman/webman/login.cgi");
|
||||
preg_match('/\"SynoToken\"\s*?:\s*?\"(.*)\"/',$login,$synotoken);
|
||||
$synotoken = trim($synotoken[1]);
|
||||
// backup the current state of QUERY_STRING
|
||||
$tmpenv = getenv('QUERY_STRING');
|
||||
putenv('QUERY_STRING=SynoToken='.$synotoken);
|
||||
$synouser = shell_exec("/usr/syno/synoman/webman/modules/authenticate.cgi");
|
||||
if ($synouser == '') return array('','',0);
|
||||
|
||||
// get dsm build
|
||||
$dsmbuild = shell_exec("/bin/get_key_value /etc.defaults/VERSION buildnumber");
|
||||
if ($dsmbuild >= 7307) {
|
||||
$raw_data = shell_exec("/usr/syno/bin/synowebapi --exec api=SYNO.Core.Desktop.Initdata method=get version=1 runner=".$synouser);
|
||||
$initdata = json_decode(trim($raw_data),true);
|
||||
$appprivilege = (array_key_exists($appname, $initdata['data']['AppPrivilege']) && $initdata['data']['AppPrivilege'][$appname]) ? 1 : 0;
|
||||
$is_admin = (array_key_exists('is_admin', $initdata['data']['Session']) && $initdata['data']['Session']['is_admin'] == 1) ? 1 : 0;
|
||||
} else {
|
||||
$raw_data = shell_exec("/usr/syno/synoman/webman/initdata.cgi");
|
||||
$raw_data = substr($raw_data,strpos($raw_data,"{")-1);
|
||||
$initdata = json_decode(trim($raw_data),true);
|
||||
$appprivilege = (array_key_exists($appname, $initdata['AppPrivilege']) && $initdata['AppPrivilege'][$appname]) ? 1 : 0;
|
||||
$is_admin = (array_key_exists('is_admin', $initdata['Session']) && $initdata['Session']['is_admin'] == 1) ? 1 : 0;
|
||||
}
|
||||
// print $synotoken." - ".$synouser." - ".$is_admin;
|
||||
// if application not found or user not admin, return empty string
|
||||
// restore the old state of QUERY_STRING
|
||||
putenv('QUERY_STRING='.$tmpenv);
|
||||
if (!$appprivilege && !$is_admin) return array('','',0);
|
||||
return array($synotoken,$synouser,$is_admin);
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?php require('includes/check_privilege.inc.php'); list($synotoken,
|
||||
$synouser, $is_admin) =
|
||||
check_privilege('SYNO.SDS.synOTR.Application'); if ($synouser == '')
|
||||
{
|
||||
echo "0";
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "token: $synotoken user: $synouser admin: $is_admin";
|
||||
}
|
||||
?>
|
4
Build/ui/app/binARMv7l/otrpidecoder
Executable file
|
@ -0,0 +1,4 @@
|
|||
#!/bin/bash
|
||||
LIBDIR="/usr/syno/synoman/webman/3rdparty/synOTR/app/libARMv7l"
|
||||
export LD_LIBRARY_PATH="$LIBDIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
||||
$LIBDIR/otrpidecoder "$@"
|
BIN
Build/ui/app/libARMv7l/libcrypto.so.1.0.2
Normal file
BIN
Build/ui/app/libARMv7l/libcurl.so.4
Normal file
BIN
Build/ui/app/libARMv7l/libcurl.so.4.4.0
Normal file
BIN
Build/ui/app/libARMv7l/libhogweed.so.4
Normal file
BIN
Build/ui/app/libARMv7l/libidn2.so.0.1.4
Normal file
BIN
Build/ui/app/libARMv7l/libnettle.so.6
Normal file
BIN
Build/ui/app/libARMv7l/libpsl.so.5.1.1
Normal file
BIN
Build/ui/app/libARMv7l/librtmp.so.1
Normal file
BIN
Build/ui/app/libARMv7l/libssl.so.1.0.2
Normal file
BIN
Build/ui/app/libARMv7l/libunistring.so.0.1.2
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/lib4758cca.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libaep.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libatalla.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libcapi.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libchil.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libcswift.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libgmp.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libgost.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libnuron.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libpadlock.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libsureware.so
Normal file
BIN
Build/ui/app/libARMv7l/openssl-1.0.2/engines/libubsec.so
Normal file
20
Build/ui/config
Normal file
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
".url": {
|
||||
"SYNO.SDS.ThirdParty.App.synOTR": {
|
||||
"type": "legacy",
|
||||
"title": "synOTR",
|
||||
"desc": "synOTR",
|
||||
"allUsers": false,
|
||||
"allowMultiInstance": false,
|
||||
"grantPrivilege": "all",
|
||||
"advanceGrantPrivilege": true,
|
||||
"configablePrivilege": true,
|
||||
"icon": "images/synOTR_{0}.png",
|
||||
"appWindow": "SYNO.SDS.ThirdParty.App.synOTR",
|
||||
"texts": "texts",
|
||||
"width": 992,
|
||||
"height": 560,
|
||||
"url": "/webman/3rdparty/synOTR/index.cgi"
|
||||
}
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 7 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 857 B After Width: | Height: | Size: 857 B |
Before Width: | Height: | Size: 855 B After Width: | Height: | Size: 855 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 676 B After Width: | Height: | Size: 676 B |
Before Width: | Height: | Size: 591 B After Width: | Height: | Size: 591 B |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 953 B After Width: | Height: | Size: 953 B |
Before Width: | Height: | Size: 128 KiB After Width: | Height: | Size: 128 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.6 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |