Changeset 660

Timestamp:

Nov 10, 2011, 9:32:23 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5.x: Support WINS, store credentials

Location:

trunk/guitools

Files:

• evfsgui/changes (modified) (2 diffs)
• evfsgui/evfsgui.vrp (modified) (1 diff)
• evfsgui/evfsgui.vrx (modified) (28 diffs)
• evfsgui/evfsgui.vry (modified) ( previous)
• evfsgui/rc/lang/evfsi_de.mkm (modified) (1 diff)
• evfsgui/rc/lang/evfsi_en.mkm (modified) (1 diff)
• evfsgui/rc/lang/evfsi_fr.mkm (modified) (1 diff)
• evfsgui/rc/lang/evfsi_it.mkm (modified) (1 diff)
• shared/cltinit.vrs (modified) (1 diff)
• shared/smbtree.vrs (modified) (4 diffs)
• shared/usercredmem.vrs (added)
• smbmon/logo.bmp (deleted)
• smbmon/netlabs.bmp (deleted)

trunk/guitools/evfsgui/changes

@@ -4 +4 @@
 - Support server based logon scripts (requires REXX rpc library,
   partly done) (works in a separate utility right now)
-- TDB auch bei 3.5 CLUT kaputt
 - eigenes Icon fr ADMIN$
 - _AddSharesDisplay verwendet kein file2stem
+- session user/password
 
 Known problems:
@@ -16 +16 @@
   
 Version 2.5.x 2011-??-??
-+ Added: Create/maintain LMHosts automagically (speeds up connecting!!!)
++ Added: Optionally store credentials in memory until next reboot
++ Added: Properly verify all manually entered IP addresses
++ Added: Connection speedup: Allow configuration of name resolve order 
++ Added: Connection speedup: Allow configuration of WINS server
++ Added: Connection speedup: Optionally create/maintain LMHosts automagically
 + Added: Enhanced, faster browsing code (major code refactoring)
 + Added: Allow refreshing a single machine in the network neighbourhood

trunk/guitools/evfsgui/evfsgui.vrp

@@ -10 +10 @@
 VRXWindow: __VREMainWindow,1,1951,2361,891,7841
 VRXWindow: __VREFileListWindow,1,2987,5155,2665,3358
-VRXWindow: __VRESectionListWindow,1,3830,10841,8082,3324
+VRXWindow: __VRESectionListWindow,1,3903,10744,8082,4505
 VRXWindow: __VREToolsWindow,0,2987,8528,6486,1669
-VRXWindow: __VREWindListWindow,1,1168,10841,2650,3150
+VRXWindow: __VREWindListWindow,1,193,10841,3686,3150
 UserFile: 1
 UserWindow: Main,1
 UserWindow: SW_LOGIN,1
+UserWindow: SW_SETTINGS,1
+UserWindow: SW_SMBTREE,1
+UserWindow: SW_DIALOG,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -97 +97 @@
 #append U:\Develop\Samba\trunk\guitools\shared\smbtree.vrs
 #append U:\Develop\Samba\trunk\guitools\shared\textini.vrs
+#append U:\Develop\Samba\trunk\guitools\shared\usercredmem.vrs
 */
 return
@@ -782 +783 @@
     if \VRFileExists( samba.!smbconf ) then call _CreateSmbConf
 
+    say _ucInitObj()
+
+    options.!storecreds = _ucChkObj()
+
     IF STREAM( settings.!ini, 'C', 'QUERY EXISTS') == '' THEN DO
         /* First start */
@@ -919 +924 @@
     end
 
+    /* Look for usable credentials */
+    if options.!storecreds = 1 & _ucChkUc() then do
+        UserCred = _ucGetUc()
+        parse var UserCred '--user='Credentials.!username'%'Credentials.!password
+        ok = VRSet("EF_USER",    "Value",Credentials.!username)
+        ok = VRSet("EF_PASSWORD","Value",Credentials.!password)
+    end
+
     /* SambaInit.VRS needs these 2 */
     ShowHidden = advanced.!special
@@ -991 +1004 @@
     IF options.!debug == 1 THEN SAY time()' '||"SaveSettings done"
 RETURN
+
+/*:VRX         _isValidIPAddress
+*/
+_isValidIPAddress: procedure
+   ipaddr = arg(1)
+   d. = ''
+   d.0 = 4
+   fail = 0
+   parse var ipaddr d.1 '.' d.2 '.' d.3 '.' d.4
+   do I = 1 to 4
+       if datatype(d.I) = 'NUM' then do
+           if d.I < 0 | d.I > 255 then fail = 1
+       end
+       else fail = 1
+       if fail = 1 then leave
+   end
+return(\fail)
 
 /*:VRX         _LMHostsRead
@@ -1064 +1094 @@
 */
 _LoadOtherFuncs: 
-    CALL RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
-    CALL SysLoadFuncs
+    call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
+    call SysLoadFuncs
+
+    call rxfuncadd 'IniLoadFuncs', 'REXXINI', 'IniLoadFuncs'
+    call IniLoadFuncs
 
     call RxFuncAdd 'PRLoadFuncs',  'PR1UTIL', 'PRLoadFuncs'
     call PRLoadFuncs
+
+    call RxFuncAdd 'RxuInit','Rxu','RxuInit'
+    call RxuInit
 return
 
@@ -1317 +1353 @@
 return
 
+/*:VRX         _SmbConfCreateShadowCopy
+*/
+_SmbConfCreateShadowCopy: 
+    /* we create a complete version of smb.conf in temporary directory for reading purposes */
+    /* as we can only determine a default value from this complete version of the file */
+    /* however it is not desirable to always have a complete copy normally */
+    ok = SysFileDelete(samba.!shadowsmbconf)
+    say         samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    address cmd samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+return
+
 /*:VRX         _SMBpdrInstalled
 */
@@ -1350 +1397 @@
     options.!editmode   = 0
     options.!delay      = 0
+    options.!storecreds = 0
 
     IF options.!debug == 1 THEN SAY '  initializing vfs. '
@@ -1368 +1416 @@
     advanced.!cachetimeout  = '10'
     advanced.!cachelistings = '32'
+
+    advanced.!smbconfchanged = 0
 
     /* Obsolete */
@@ -1470 +1520 @@
         then UserCred = '--user='Credentials.!username'%'Credentials.!password
         else UserCred = '--user='Credentials.!username'%%'Credentials.!password
+
+    if options.!storecreds = 1 & \(UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '-N') then do
+        ok = _ucSetUc()
+        call beep 2400, 10
+    end
+    else call beep 200, 20
 return
 
@@ -1628 +1684 @@
         CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 1
         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 1
-        CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1
+/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 1 */
         CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 1
-        CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 1
+/*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 1 */
         
     END
@@ -1637 +1693 @@
         CALL VRSet 'MENU_CONTEXT_DETACH',     'Visible', 0
         CALL VRSet 'MENU_CONTEXT_OPEN',       'Visible', 0
-        CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0
+/*      CALL VRSet 'MENU_CONTEXT_SEP1',       'Visible', 0 */
         CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 0
-        CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 0
-        
+/*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 0 */
     END
     
@@ -2129 +2184 @@
 */
 EF_PASSWORD_Change:
+    Now = VRGet("EF_PASSWORD","value")
+    if Now = "" | Now = LastPassword then return
+    ok = SysSleep(1)
+    LastPassword = Now
+    if Now <> VRGet("EF_PASSWORD","value") then return
     call _UserCredUpdate
 return
@@ -2145 +2205 @@
 
     /* Do nothing for incomplete IP addresses */
-    if strip(translate(VRGet("EF_SERVER","value"),copies(' ',11),'01234567890.')) = "" & length(VRGet("EF_SERVER","value")) < 7 then return
+    if strip(translate(VRGet("EF_SERVER","value"),copies(' ',11),'01234567890.')) = "" then do /* got an IP address */
+        if \_IsValidIPAddress(VRGet("EF_SERVER","value")) then return /* it is invalid or incomplete */
+    end
 
     machine = VRGet("EF_SERVER","value")    
@@ -2198 +2260 @@
 */
 EF_USER_Change:
+    Now = VRGet("EF_USER","value")
+    if Now = "" | Now = LastUser then return
+    ok = SysSleep(1)
+    LastUser = Now
+    if Now <> VRGet("EF_USER","value") then return
     call _UserCredUpdate
+return
+
+/*:VRX         EF_WINS_SERVER_Change
+*/
+EF_WINS_SERVER_Change: 
+    advanced.!smbconfchanged = 1
 return
 
@@ -2407 +2480 @@
     options.!debug    = 1
     IF options.!debug == 1 THEN do
-        ok = VRREdirectStdIO("ON")
+        ok = VRRedirectStdIO("ON")
         say time()' Main_Create started'
     end
-    else ok = VRREdirectStdIO("OFF")
+    else ok = VRRedirectStdIO("OFF")
 
     call _LoadOtherFuncs
@@ -3048 +3121 @@
 */
 Menu_Help_Extended_Click:
-    call PB_HELP_Click
+    ok = VRMethod( "Main", "InvokeHelp" ) 
 return
 
@@ -3061 +3134 @@
 Menu_Selected_Default_Workgroup_Click:
     workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.rh,"Caption")
+    /* FIXME: switch over to REXXIni calls */
     ok = TRSetIni("[global]","workgroup", workgroupname, samba.!smbconf)
 return
@@ -3636 +3710 @@
     ok = VRSet("EF_USER","Value",VRGet("EF_USER1","Value"))
     ok = VRSet("EF_PASSWORD","Value",VRGet("EF_PASSWORD1","Value"))
+    options.!storecreds = VRGet("CB_STORECREDS1","Set")
     credentials.!entered = 1
 
@@ -3831 +3906 @@
 
     /* Note: CB_LOGGING has its own event tied to the click */
-
+    options.!storecreds   = VRGet("CB_STORECREDS", "Set" )
     options.!debug        = VRGet("CB_DEBUG",      "Set" )
 
@@ -3867 +3942 @@
         call _LMHostsUpdate
     end
+    if advanced.!smbconfchanged = 1 then do
+        name_resolve_order = VRGet("SPIN_NRO1","value")' 'VRGet("SPIN_NRO2","value")' 'VRGet("SPIN_NRO3","value")' 'VRGet("SPIN_NRO4","value")
+        handle = IniOpen('global', samba.!smbconf)
+        call IniSet 'name resolve order', name_resolve_order, handle
+        /* FIXME: Throw an error in this case */
+        if \_IsValidIPAddress(VRGet("EF_WINS_SERVER","Value")) then ok = VRSet("EF_WINS_SERVER","Value","")
+        call IniSet 'wins server', VRGet("EF_WINS_SERVER","Value"), handle
+        call IniSave handle
+        call IniClose handle
+        advanced.!smbconfchanged = 0
+        ok = VRSet("PB_SETTINGS_UNDO","Enabled", 0)
+    end
 return
 
@@ -4005 +4092 @@
 /*:VRX         PB_SMBTREE_REFRESH_Click
 */
-PB_SMBTREE_REFRESH_Click: PROCEDURE EXPOSE settings. options. icons. fs. samba. debuglevel advanced. UserCred Refreshmode Tempdir
+PB_SMBTREE_REFRESH_Click: /* PROCEDURE EXPOSE settings. options. icons. fs. samba. debuglevel advanced. UserCred Refreshmode Tempdir */
     IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
 
@@ -4096 +4183 @@
 
     ok = VRSet("MENU_CONTEXT_OPEN",    "Visible",  0)
-    ok = VRSet("MENU_CONTEXT_SEP1",    "Visible",  0)
+/*  ok = VRSet("MENU_CONTEXT_SEP1",    "Visible",  0) */
     ok = VRSet("MENU_CONTEXT_DETACH",  "Visible",  0)
     ok = VRSet("MENU_CONTEXT_UNMOUNT", "Visible",  0)
@@ -4126 +4213 @@
     IF options.!debug == 1 THEN SAY time()' '||"Refresh done"
 RETURN 0
+
+/*:VRX         SPIN_NRO1_Change
+*/
+SPIN_NRO1_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_NRO2_Change
+*/
+SPIN_NRO2_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_NRO3_Change
+*/
+SPIN_NRO3_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_NRO4_Change
+*/
+SPIN_NRO4_Change: 
+    advanced.!smbconfchanged = 1
+return
 
 /*:VRX         SPLIT_Main_Move
@@ -4385 +4496 @@
 */
 SW_LOGIN_Create:
-    call SW_LOGIN_Init
-    CALL NLVSetText 'DT_USER1',      "Caption", 25
-    CALL NLVSetText 'DT_PASSWORD1',  "Caption", 26
+    call SW_LOGIN_Init 
+    CALL NLVSetText 'DT_USER1',       "Caption", 25
+    CALL NLVSetText 'DT_PASSWORD1',   "Caption", 26
+    CALL NLVSetText 'CB_STORECREDS1', "Caption", 135
     CALL NLVSetText 'PB_LOGIN_OK',    "Caption", 2
     CALL NLVSetText 'PB_LOGIN_CANCEL',"Caption", 3
+
     /* ok = VRSet("Pict_Login","PicturePath", SMBObj.icon) */
     ok = VRSet("EF_USER1","Value",VRGet("EF_USER","Value"))
     ok = VRSet("EF_PASSWORD1","Value",VRGet("EF_PASSWORD","Value"))
+    ok = VRSet("CB_STORECREDS1","Set",options.!storecreds)
 return
 
@@ -4609 +4723 @@
     call NLVSetText "CB_BROADCAST",      "Caption", 74
     call NLVSetText "CB_MINIICONS",      "Caption", 70
+    call NLVSetText "CB_STORECREDS",     "Caption", 135
 
     /* Buttons */
@@ -4625 +4740 @@
 */
 SW_SETTINGS_Init_Content: 
+    ok = VRSet("PB_SETTINGS_UNDO","Enabled", 1)
+
     if advanced.!browseauth  \= ""  then ok = VRSet("CB_BROWSEAUTH", "Set",   advanced.!browseauth)
     if advanced.!browseimme  \= ""  then ok = VRSet("CB_BROWSEIMME", "Set",   advanced.!browseimme)
@@ -4634 +4751 @@
     call VRSet "CB_LOGGING", "Set", VRFileExists(SysBootDrive()"\ndpsmb.dbg")
     if options.!debug        \= ""  then ok = VRSet("CB_debug",      "Set",   options.!debug)
+    if options.!storecreds   \= ""  then ok = VRSet("CB_STORECREDS", "Set",   options.!storecreds)
 
     if advanced.!miniicons   \= ""  then ok = VRSet("CB_MINIICONS",  "Set",   advanced.!miniicons)
@@ -4640 +4758 @@
     if advanced.!logfile     \= ""  then ok = VRSet("EF_LOGFILE",    "Value", advanced.!logfile)
     if advanced.!loglevel    \= "0" then ok = VRSet("SPIN_LOGLEVEL", "Value", advanced.!loglevel)
+
+    call _SmbConfCreateShadowCopy
+
+    wins_support = translate(IniGet('wins support', 'global', samba.!shadowsmbconf))
+
+    if wins_support = "YES" then do /* we are a WINS server ourself */
+        ok = VRSet("DT_WINS_SERVER","Enabled", 0)
+        ok = VRSet("EF_WINS_SERVER","BackColor", "PaleGray")
+        ok = VRSet("EF_WINS_SERVER","Value", "")
+        ok = VRSet("EF_WINS_SERVER","Enabled", 0)
+    end
+    else do
+        ok = VRSet("EF_WINS_SERVER","Value", IniGet('wins server', 'global', samba.!shadowsmbconf))
+    end
+
+    name_resolve_order = IniGet('name resolve order', 'global', samba.!shadowsmbconf)
+
+    do I = 1 to words(name_resolve_order)
+        ok = VRSet("SPIN_NRO"||I, "value", word(name_resolve_order,I))
+    end
+
+    advanced.!smbconfchanged = 0    
 return
 

trunk/guitools/evfsgui/rc/lang/evfsi_de.mkm

@@ -144 +144 @@
 EVG0133I: LMHosts verwalten
 EVG0134I: TRAC Wiki Notation anfgen
+EVG0135I: Anmeldeinformationen speichern

trunk/guitools/evfsgui/rc/lang/evfsi_en.mkm

@@ -144 +144 @@
 EVG0133I: Manage LMHosts
 EVG0134I: Add TRAC Wiki markup
+EVG0135I: Store credentials until next reboot

trunk/guitools/evfsgui/rc/lang/evfsi_fr.mkm

@@ -150 +150 @@
 EVG0133I: G‚rer le fichier LMHosts
 EVG0134I: Ajouter TRAC Wiki balisage
+EVG0135I: R‚f‚rences magasin jusqu'au prochain red‚marrage

trunk/guitools/evfsgui/rc/lang/evfsi_it.mkm

@@ -148 +148 @@
 EVG0133I: Gestire il file LMHosts
 EVG0134I: Aggiungi TRAC Wiki markup
+EVG0135I: Credenziali di memorizzare fino al riavvio successivo

trunk/guitools/shared/cltinit.vrs

@@ -124 +124 @@
     IF options.!debug == 1 THEN say '  Samba smb.conf = "'samba.!smbconf'"'
 
+    /* complete shadow copy of smb.conf in temporary directory - should always be created on the fly */
+    /* before reading from it */
+    samba.!shadowsmbconf = TempDir||'smb.conf'
+
+    /* lmhosts */
+    samba.!lmhosts = ETC'\samba\lmhosts'
+    if \VRFileExists(samba.!lmhosts) then call _ErrorDataFileNotFound samba.!lmhosts' is not present.'
+    IF options.!debug == 1 THEN say '  Samba lmhosts  = "'samba.!lmhosts'"'
+
+    /* FIXME: Needs to be changed for Samba 3.3+ */
     /* upcase table files - several utilities need these */
     if (\VRFileExists(samba.!bin'\lib\upcase.dat')) |,

trunk/guitools/shared/smbtree.vrs

@@ -172 +172 @@
         ok = VRSet("TM_RefreshTreeDisplay","Delay", 1000)
         ok = VRSet("CN_smbtree","Enabled", 1)
+        if DoLMHosts = 1 then do
+            call _LMHostsRead
+            call _LMHostsUpdate
+        end
         ok = VRSet("CN_smbtree", "Painting", 0 )
         ok = VRSet("CN_smbtree", "Painting", 1 )
@@ -510 +514 @@
 return IPStr'|'MAC'|'Roles
 
+
+
 /*:VRX         file2stem
 */
@@ -515 +521 @@
     msgfile = arg(1)
     msgstem = arg(2)
+    delmsgfile = translate(arg(3))
     if right(msgstem,1) <> '.' then msgstem = msgstem'.'
     say '  file2stem("'msgfile'","'msgstem'")'
@@ -533 +540 @@
     interpret dyn
     ok = stream(msgfile,'c','close')
-    ok = SysFileDelete(msgfile)
+    if delMsgFile <> "NODEL" then ok = SysFileDelete(msgfile)
     drop msgfile msgstem
 return stemcount