Merge pull request #46 from jhalter/implement_access_no_agreement

[rbdr/mobius] / hotline / access.go

diff --git a/hotline/access.go b/hotline/access.go
index e2076ad1af4f738b36675ce39cae552f8c91b9e5..bc3cb0d8451e278e685959cd1150c66cba442a67 100644 (file)
--- a/hotline/access.go
+++ b/hotline/access.go
@@ -6,8 +6,6 @@ import (
 )
 
 const (
 )
 
 const (

-       accessAlwaysAllow = -1 // Some transactions are always allowed
-

        // File System Maintenance
        accessDeleteFile   = 0
        accessUploadFile   = 1
        // File System Maintenance
        accessDeleteFile   = 0
        accessUploadFile   = 1


@@ -28,25 +26,25 @@ const (
        accessOpenUser   = 16
        accessModifyUser = 17
        // accessChangeOwnPass    = 18 // Documented but unused?
        accessOpenUser   = 16
        accessModifyUser = 17
        // accessChangeOwnPass    = 18 // Documented but unused?

-       //accessSendPrivMsg      = 19 // This doesn't do what it seems like it should do. TODO: Investigate
-       accessNewsReadArt    = 20
-       accessNewsPostArt    = 21
-       accessDisconUser     = 22 // Toggles red user name in user list
-       accessCannotBeDiscon = 23
-       accessGetClientInfo  = 24
-       //accessUploadAnywhere   = 25
-       //accessAnyName          = 26
-       //accessNoAgreement      = 27
-       //accessSetFileComment   = 28
-       //accessSetFolderComment = 29
-       //accessViewDropBoxes    = 30
-       //accessMakeAlias        = 31
-       accessBroadcast     = 32
-       accessNewsDeleteArt = 33
-       accessNewsCreateCat = 34
-       //accessNewsDeleteCat    = 35
+       // accessSendPrivMsg      = 19 // This doesn't do what it seems like it should do. TODO: Investigate
+       accessNewsReadArt      = 20
+       accessNewsPostArt      = 21
+       accessDisconUser       = 22 // Toggles red user name in user list
+       accessCannotBeDiscon   = 23
+       accessGetClientInfo    = 24
+       accessUploadAnywhere   = 25
+       accessAnyName          = 26
+       accessNoAgreement      = 27
+       accessSetFileComment   = 28
+       accessSetFolderComment = 29
+       accessViewDropBoxes    = 30
+       accessMakeAlias        = 31
+       accessBroadcast        = 32
+       accessNewsDeleteArt    = 33
+       accessNewsCreateCat    = 34
+       // accessNewsDeleteCat    = 35

        accessNewsCreateFldr = 36
        accessNewsCreateFldr = 36

-       //accessNewsDeleteFldr   = 37
+       // accessNewsDeleteFldr   = 37

 )
 
 type accessBitmap [8]byte
 )
 
 type accessBitmap [8]byte


@@ -58,9 +56,6 @@ func (bits *accessBitmap) Set(i int) {
 // authorize checks if 64 bit access slice contain has accessBit set
 // TODO: refactor to use accessBitmap type
 func authorize(access *[]byte, accessBit int) bool {
 // authorize checks if 64 bit access slice contain has accessBit set
 // TODO: refactor to use accessBitmap type
 func authorize(access *[]byte, accessBit int) bool {

-       if accessBit == accessAlwaysAllow {
-               return true
-       }

        bits := big.NewInt(int64(binary.BigEndian.Uint64(*access)))
 
        return bits.Bit(63-accessBit) == 1
        bits := big.NewInt(int64(binary.BigEndian.Uint64(*access)))
 
        return bits.Bit(63-accessBit) == 1