improce DSM compatability

Author: publicarray

package/src/synoedit/auth.go

@@ -93,22 +93,24 @@ func auth() {
 	}
 
 	// check permissions
-	cmd = exec.Command("/usr/syno/synoman/webman/initdata.cgi") // performance hit
-	cmdOut, err := cmd.Output()
-	if err != nil {
-		logUnauthorised(err.Error())
-	}
-	cmdOut = bytes.TrimLeftFunc(cmdOut, findJSON)
-
-	var jsonData AuthJSON
-	if err := json.Unmarshal(cmdOut, &jsonData); err != nil { // performance hit
-		logUnauthorised(err.Error())
-	}
-
-	isAdmin := jsonData.Session.IsAdmin              // Session.IsAdmin:true
-	isPermitted := jsonData.AppPrivilege.IsPermitted // AppPrivilege.SYNO.SDS.DNSCryptProxy.Application:true
-	if !(isAdmin || isPermitted) {
-		notFound()
+	if FileExists("/usr/syno/synoman/webman/initdata.cgi") {
+		cmd = exec.Command("/usr/syno/synoman/webman/initdata.cgi") // performance hit
+		cmdOut, err := cmd.Output()
+		if err != nil {
+			logUnauthorised(err.Error())
+		}
+		cmdOut = bytes.TrimLeftFunc(cmdOut, findJSON)
+
+		var jsonData AuthJSON
+		if err := json.Unmarshal(cmdOut, &jsonData); err != nil { // performance hit
+			logUnauthorised(err.Error())
+		}
+
+		isAdmin := jsonData.Session.IsAdmin              // Session.IsAdmin:true
+		isPermitted := jsonData.AppPrivilege.IsPermitted // AppPrivilege.SYNO.SDS.DNSCryptProxy.Application:true
+		if !(isAdmin || isPermitted) {
+			notFound()
+		}
 	}
 
 	os.Setenv("QUERY_STRING", tempQueryEnv)

package/src/synoedit/main.go

@@ -144,21 +144,21 @@ func main() {
 		action := postData.Get("action")
 		if action != "" && appName != "" {
 			output := ExecuteAction(appName)
-			fmt.Println("Status: 200 OK\nContent-Type: text/plain;\n")
-			fmt.Println(output)
 
-			if ajax != "" {
-				renderHTML(fileData, "Not implemented", "")
+			if ajax == "true" {
+				fmt.Println("Status: 200 OK\nContent-Type: text/plain;\n")
+				fmt.Println(output)
 				return
 			}
+			renderHTML(fileData, "Not implemented", "")
 			return
 		}
 
 		if fileData != "" && appName != "" && fileName != "" {
 			filePath := GetFilePath(appName, fileName)
 			SaveFile(filePath, fileData)
 
-			if ajax != "" {
+			if ajax == "true" {
 				fmt.Println("Status: 200 OK\nContent-Type: text/plain;\n")
 				fmt.Println("File saved successfully!")
 				return
@@ -178,7 +178,7 @@ func main() {
 			fileData = ReadFile(GetFilePath(appName, fileName))
 		}
 
-		if ajax := readGet().Get("ajax"); ajax != "" {
+		if ajax := readGet().Get("ajax"); ajax == "true" {
 			// expect an ajax response
 			fmt.Println("Status: 200 OK\nContent-Type: text/plain;\n")
 			fmt.Println(fileData)

package/src/synoedit/utils.go

@@ -22,15 +22,6 @@ import (
 	"os/exec"
 )
 
-// CheckCmdExists looks for command in $PATH
-func CheckCmdExists(cmd string) bool {
-	_, err := exec.LookPath(cmd)
-	if err != nil {
-		return false
-	}
-	return true
-}
-
 // GetFilePath returns the complete file path given the App and file name
 func GetFilePath(appName string, fileName string) string {
 	if app, exists := config.Applications[appName]; exists {
@@ -47,7 +38,7 @@ func GetFilePath(appName string, fileName string) string {
 }
 
 // Look for command in $PATH or Check that file exits
-func checkCmdExists(cmd string) bool {
+func CheckCmdExists(cmd string) bool {
 	_, err := exec.LookPath(cmd)
 	if err != nil {
 		return FileExists(cmd)
@@ -59,7 +50,7 @@ func checkCmdExists(cmd string) bool {
 func ExecuteAction(appName string) string {
 	if app, exists := config.Applications[appName]; exists {
 
-		if !checkCmdExists(*app.Action.Exec) {
+		if !CheckCmdExists(*app.Action.Exec) {
 			logError("Command could not be found or is not installed!")
 		}
 

package/ui/js/main.js

@@ -33,7 +33,7 @@ if (typeof CodeMirror === "undefined") {
     CodeMirror.commands.save = function(insance) { // overload save function
         debug("CodeMirror save event", insance)
         insance.save()
-        var param = addParameter('app', appSelector.value) + addParameter('file', fileSelector.value)
+        var param = addParameter('app', appSelector.value) + addParameter('file', fileSelector.value) + addParameter('ajax', 'true')
         ajax('POST', 'fileContent='+encodeURIComponent(textArea.value) + param, function() { // insance.getTextArea().value
             // restart fade animation
             successMessage.style.animation = 'none';
@@ -170,7 +170,7 @@ actionForm.addEventListener('submit', function(e) {
 fileForm.addEventListener('submit', function saveForm (e) {
     if (e && typeof e.preventDefault === 'function') e.preventDefault();
     debug('file content submit event', e)
-    var param = addParameter('app', appSelector.value) + addParameter('file', fileSelector.value)
+    var param = addParameter('app', appSelector.value) + addParameter('file', fileSelector.value) + addParameter('ajax', 'true')
     debug('params', param)
     ajax('POST', 'fileContent='+encodeURIComponent(textArea.value) + param, function() {
         // restart fade animation