Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/fs/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ func main() {
var localAddr = ""
var relayHost = PFE_HOST
var relayPort = PFE_PORT
var isDemo = false

// Parse the program inputs
if !PRODUCTION {
Expand All @@ -74,6 +75,10 @@ func main() {
}
flag.Parse()

if rootDir != "" {
isDemo = true
}

apiKey := ""
if PRODUCTION || (!PRODUCTION && (apiKeyFlag == "")) {
// no command line override - get it from the db
Expand Down Expand Up @@ -108,7 +113,7 @@ func main() {
os.Exit(1)
}

service, err := NewMercuryFSService(rootDir, localAddr)
service, err := NewMercuryFSService(rootDir, localAddr, isDemo)
if err != nil {
fmt.Printf("Error making service (%s, %s): %s\n", rootDir, localAddr, err.Error())
os.Remove(PID_FILE)
Expand All @@ -128,7 +133,7 @@ func main() {
}

runtime.GOMAXPROCS(1000)
go startLocalServer(rootDir, metadata)
go startLocalServer(rootDir, metadata, isDemo)

// Continually connect to the proxy and listen for requests
// Reconnect if there is an error
Expand Down
44 changes: 30 additions & 14 deletions src/fs/hda_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ type HdaUser struct {
UpdatedAt time.Time `json:"updated_at"`
LastRequestAt time.Time `json:"last_request_at"`
LastCheckedAt time.Time `json:"last_checked_at"`
IsDemo bool `json:"is_demo"`
}

type HdaUsers struct {
Users map[string]*HdaUser
IsDemo bool
Users map[string]*HdaUser
sync.RWMutex
}

func NewHdaUsers() *HdaUsers {
return &HdaUsers{Users: make(map[string]*HdaUser)}
func NewHdaUsers(isDemo bool) *HdaUsers {
return &HdaUsers{IsDemo: isDemo, Users: make(map[string]*HdaUser)}
}

func tokenGenerator() string {
Expand All @@ -33,17 +35,25 @@ func tokenGenerator() string {
}

func (users *HdaUsers) queryUser(pin string) (*string, error) {
dbconn, err := sql.Open("mysql", MYSQL_CREDENTIALS)
if err != nil {
log(err.Error())
return nil, err
}
defer dbconn.Close()
q := "SELECT id, login, name, updated_at FROM users WHERE pin=?"
user := new(HdaUser)
err = dbconn.QueryRow(q, pin).Scan(&user.id, &user.Login, &user.Name, &user.UpdatedAt)
if err != nil {
return nil, err
if users.IsDemo {
user.IsDemo = true
user.id = 0
user.LastCheckedAt = time.Now()
user.UpdatedAt = time.Now()
} else {
dbconn, err := sql.Open("mysql", MYSQL_CREDENTIALS)
if err != nil {
log(err.Error())
return nil, err
}
defer dbconn.Close()
q := "SELECT id, login, name, updated_at FROM users WHERE pin=?"

err = dbconn.QueryRow(q, pin).Scan(&user.id, &user.Login, &user.Name, &user.UpdatedAt)
if err != nil {
return nil, err
}
}
authToken := users.updateUserIfExists(user)
if authToken != "" {
Expand Down Expand Up @@ -75,7 +85,7 @@ func (users *HdaUsers) find(authToken string) *HdaUser {
users.Lock()
defer users.Unlock()
user := users.Users[authToken]
if user != nil {
if !(user == nil || user.IsDemo) {
if time.Now().Sub(user.LastCheckedAt) > time.Minute*5 {
isValid, err := users.revalidateSession(authToken, user)
if isValid || (!isValid && err != nil) {
Expand Down Expand Up @@ -146,6 +156,9 @@ func (user *HdaUser) AvailableShares() ([]*HdaShare, error) {
}

func (user *HdaUser) HasReadAccess(shareName string) (access bool, err error) {
if user.IsDemo {
return true, nil
}
dbconn, err := sql.Open("mysql", MYSQL_CREDENTIALS)
if err != nil {
log(err.Error())
Expand All @@ -161,6 +174,9 @@ func (user *HdaUser) HasReadAccess(shareName string) (access bool, err error) {
}

func (user *HdaUser) HasWriteAccess(shareName string) (access bool, err error) {
if user.IsDemo {
return true, nil
}
dbconn, err := sql.Open("mysql", MYSQL_CREDENTIALS)
if err != nil {
log(err.Error())
Expand Down
4 changes: 2 additions & 2 deletions src/fs/local_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

const LocalServerPort = "4563"

func startLocalServer(rootDir string, metadata *metadata.Library) {
service, err := NewMercuryFSService(rootDir, ":"+LocalServerPort)
func startLocalServer(rootDir string, metadata *metadata.Library, isDemo bool) {
service, err := NewMercuryFSService(rootDir, ":"+LocalServerPort, isDemo)
if err != nil {
log(err.Error())
return
Expand Down
6 changes: 3 additions & 3 deletions src/fs/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ type MercuryFsService struct {
// NewMercuryFsService creates a new MercuryFsService, sets the FileDirectoryRoot
// and CurrentDirectory to rootDirectory and returns the pointer to the
// newly created MercuryFsService
func NewMercuryFSService(rootDir, localAddr string) (service *MercuryFsService, err error) {
func NewMercuryFSService(rootDir, localAddr string, isDemo bool) (service *MercuryFsService, err error) {
service = new(MercuryFsService)

service.Users = NewHdaUsers()
service.Users = NewHdaUsers(isDemo)
service.Shares, err = NewHdaShares(rootDir)
if err != nil {
debug(3, "Error making HdaShares: %s", err.Error())
Expand Down Expand Up @@ -282,7 +282,7 @@ func (service *MercuryFsService) serveShares(writer http.ResponseWriter, request
}
var shares []*HdaShare
var err error
if service.Shares.rootDir == "" && user != nil {
if service.Shares.rootDir == "" && !(user == nil || user.IsDemo) {
shares, err = user.AvailableShares()
if err != nil {
http.Error(writer, "Internal Server Error", http.StatusInternalServerError)
Expand Down