Răsfoiți Sursa

Updated background for login and default desktop pack

tobychui 3 ani în urmă
părinte
comite
86bb0fc6ee

+ 1 - 3
go.mod

@@ -23,9 +23,7 @@ require (
 	github.com/gorilla/sessions v1.2.1
 	github.com/gorilla/websocket v1.5.0
 	github.com/grandcat/zeroconf v1.0.0
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hirochachacha/go-smb2 v1.1.0
-	github.com/jlaffaye/ftp v0.0.0-20220829015825-b85cf1edccd4 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.15.4 // indirect
 	github.com/koron/go-ssdp v0.0.3
@@ -42,6 +40,7 @@ require (
 	github.com/satori/go.uuid v1.2.0
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/spf13/afero v1.8.2
+	github.com/stretchr/testify v1.8.0 // indirect
 	github.com/studio-b12/gowebdav v0.0.0-20220128162035-c7b1ff8a5e62
 	github.com/tidwall/pretty v1.2.0
 	github.com/ulikunitz/xz v0.5.10 // indirect
@@ -56,5 +55,4 @@ require (
 	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
 	golang.org/x/tools v0.1.10 // indirect
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

+ 0 - 7
go.sum

@@ -265,14 +265,10 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -297,8 +293,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/jlaffaye/ftp v0.0.0-20220829015825-b85cf1edccd4 h1:8bWaY08VCoFn17gezYWKLhCwAJr2Er8tUOZCvDVshos=
-github.com/jlaffaye/ftp v0.0.0-20220829015825-b85cf1edccd4/go.mod h1:hhq4G4crv+nW2qXtNYcuzLeOudG92Ps37HEKeg2e3lE=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
@@ -426,7 +420,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=

+ 4 - 3
mod/filesystem/abstractions/nfsfs/nfsfs.go

@@ -12,9 +12,9 @@ import (
 )
 
 /*
-	FTPFS.go
+	NFSFS.go
 
-	File System Abstraciton for File Transfer Protocol (FTP)
+	Network File System as File System Abstraction
 
 */
 
@@ -23,7 +23,8 @@ type NFSFileSystemAbstraction struct {
 	hierarchy string
 }
 
-func NewNFSFileSystemAbstraction(uuid string, hierarchy string, ipAndPort string, username string, password string) (NFSFileSystemAbstraction, error) {
+func NewNFSFileSystemAbstraction(uuid string, hierarchy string, hostname string, target string, dir string, username string, password string) (NFSFileSystemAbstraction, error) {
+
 	return NFSFileSystemAbstraction{
 		uuid:      uuid,
 		hierarchy: hierarchy,

+ 2 - 2
mod/filesystem/arozfs/arozfs.go

@@ -77,7 +77,7 @@ func NewRedirectionError(targetVpath string) error {
 
 //Check if a file system is network drive
 func IsNetworkDrive(fstype string) bool {
-	if fstype == "webdav" || fstype == "ftp" || fstype == "smb" {
+	if fstype == "webdav" || fstype == "ftp" || fstype == "smb" || fstype == "nfs" {
 		return true
 	}
 
@@ -86,7 +86,7 @@ func IsNetworkDrive(fstype string) bool {
 
 //Get a list of supported file system types for mounting via arozos
 func GetSupportedFileSystemTypes() []string {
-	return []string{"ext4", "ext2", "ext3", "fat", "vfat", "ntfs", "webdav", "ftp", "smb"}
+	return []string{"ext4", "ext2", "ext3", "fat", "vfat", "ntfs", "webdav", "ftp", "smb", "nfs"}
 }
 
 /*

+ 20 - 19
mod/filesystem/filesystem.go

@@ -24,7 +24,6 @@ import (
 
 	db "imuslab.com/arozos/mod/database"
 	"imuslab.com/arozos/mod/filesystem/abstractions/localfs"
-	"imuslab.com/arozos/mod/filesystem/abstractions/nfsfs"
 	"imuslab.com/arozos/mod/filesystem/abstractions/smbfs"
 	"imuslab.com/arozos/mod/filesystem/abstractions/webdavfs"
 	"imuslab.com/arozos/mod/filesystem/arozfs"
@@ -228,24 +227,26 @@ func NewFileSystemHandler(option FileSystemOption) (*FileSystemHandler, error) {
 			Closed:                false,
 		}, nil
 	} else if fstype == "nfs" {
-		ftpfs, err := nfsfs.NewNFSFileSystemAbstraction(option.Uuid, option.Hierarchy, option.Path, option.Username, option.Password)
-		if err != nil {
-			return nil, err
-		}
-		return &FileSystemHandler{
-			Name:                  option.Name,
-			UUID:                  option.Uuid,
-			Path:                  option.Path,
-			ReadOnly:              option.Access == arozfs.FsReadOnly,
-			RequireBuffer:         true,
-			Hierarchy:             option.Hierarchy,
-			HierarchyConfig:       nil,
-			InitiationTime:        time.Now().Unix(),
-			FilesystemDatabase:    nil,
-			FileSystemAbstraction: ftpfs,
-			Filesystem:            fstype,
-			Closed:                false,
-		}, nil
+		/*
+			ftpfs, err := nfsfs.NewNFSFileSystemAbstraction(option.Uuid, option.Hierarchy, option.Path, option.Username, option.Password)
+			if err != nil {
+				return nil, err
+			}
+			return &FileSystemHandler{
+				Name:                  option.Name,
+				UUID:                  option.Uuid,
+				Path:                  option.Path,
+				ReadOnly:              option.Access == arozfs.FsReadOnly,
+				RequireBuffer:         true,
+				Hierarchy:             option.Hierarchy,
+				HierarchyConfig:       nil,
+				InitiationTime:        time.Now().Unix(),
+				FilesystemDatabase:    nil,
+				FileSystemAbstraction: ftpfs,
+				Filesystem:            fstype,
+				Closed:                false,
+			}, nil
+		*/
 
 	} else if option.Filesystem == "virtual" {
 		//Virtual filesystem, deprecated

BIN
web/img/desktop/bg/default/0.jpg


BIN
web/img/desktop/bg/default/1.jpg


BIN
web/img/desktop/bg/default/2.jpg


BIN
web/img/desktop/bg/default/3.jpg


BIN
web/img/desktop/bg/default/4.jpg


BIN
web/img/desktop/bg/default/5.jpg


BIN
web/img/public/auth_bg.jpg


BIN
web/img/public/legacy/auth_bg_2022.jpg