Author: lslezak Date: Fri Apr 24 09:06:20 2009 New Revision: 56957 URL: http://svn.opensuse.org/viewcvs/yast?rev=56957&view=rev Log: - DBus service - better handle "::" separators in name space string - replace it by "/" in DBus object path and "." in PolicyKit action ID string - 2.18.7 Added: trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy (contents, props changed) - copied, changed from r56956, trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy Removed: trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy Modified: trunk/core/VERSION trunk/core/dbus/namespace_service/doc/Makefile.am trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples trunk/core/dbus/namespace_service/doc/dbus_samba_export.README trunk/core/dbus/namespace_service/doc/dbus_samba_export.py trunk/core/dbus/namespace_service/doc/example-users.py trunk/core/dbus/namespace_service/src/DBusModulesServer.cc trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Apr 24 09:06:20 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/core/dbus/namespace_service/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/Makefile.am?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/doc/Makefile.am (original) +++ trunk/core/dbus/namespace_service/doc/Makefile.am Fri Apr 24 09:06:20 2009 @@ -12,7 +12,7 @@ example-arch.py \ example-users.py \ polkit_helper.py \ - org.opensuse.yast.modules.yapi-samba.policy \ + org.opensuse.yast.modules.yapi.samba.policy \ YaPI_Samba.examples EXTRA_DIST = $(html_DATA) Modified: trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples (original) +++ trunk/core/dbus/namespace_service/doc/YaPI_Samba.examples Fri Apr 24 09:06:20 2009 @@ -4,29 +4,29 @@ How to use the examples: -1. Copy org.opensuse.yast.modules.yapi-samba.policy file to /usr/share/PolicyKit/policy +1. Copy org.opensuse.yast.modules.yapi.samba.policy file to /usr/share/PolicyKit/policy directory. (Note: the file should be later moved to yast2-samba-server package.) 2. The service will return an authorization error if you are not authorized to call an exported function. - Use e.g. 'polkit-auth --obtain org.opensuse.yast.modules.yapi-samba.addshare' call to obtain + Use e.g. 'polkit-auth --obtain org.opensuse.yast.modules.yapi.samba.addshare' call to obtain the 'addshare' authorization. Call the exported function again after obtaing the authorization, this time it should succeed. 3. Try the following Bus calls: # YaPI::Samba::GetServiceStatus() - get service status (enabled/disabled in default runlevels) -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.GetServiceStatus +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.GetServiceStatus # YaPI::Samba::EnableService(boolean enable) - enable samba service -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.EditService boolean:true +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.EditService boolean:true # YaPI::Samba::GetAllDirectories() - get list of all configured shares -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.GetAllDirectories +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.GetAllDirectories # YaPI::Samba::AddShare(sting name, map options) - add a new read-only share "local" # check the end of /etc/samba/smb.conf file, there should be a new section -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.AddShare string:"local" dict:string:string:"path","/local","comment","Exported /local directory","read only","Yes" +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.AddShare string:"local" dict:string:string:"path","/local","comment","Exported /local directory","read only","Yes" # YaPI::Samba::GetShare(string name) - get properties of share "local" -dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI__Samba org.opensuse.YaST.Values.GetShare string:"local" +dbus-send --system --dest=org.opensuse.YaST.modules --print-reply --type=method_call /org/opensuse/YaST/modules/YaPI/Samba org.opensuse.YaST.Values.GetShare string:"local" Modified: trunk/core/dbus/namespace_service/doc/dbus_samba_export.README URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/dbus_samba_export.README?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/doc/dbus_samba_export.README (original) +++ trunk/core/dbus/namespace_service/doc/dbus_samba_export.README Fri Apr 24 09:06:20 2009 @@ -7,7 +7,7 @@ cp dbus_samba_export.py /usr/bin If the Samba server has been configured (by the system administrator) users who -have org.opensuse.yast.modules.yapi-samba.addshare PolicyKit authorization can +have org.opensuse.yast.modules.yapi.samba.addshare PolicyKit authorization can simply export a directory using Konqueror or Dolphin file manager. Just right-click on a folder, select "Actions" -> "Export directory as a Samba Modified: trunk/core/dbus/namespace_service/doc/dbus_samba_export.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/dbus_samba_export.py?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/doc/dbus_samba_export.py (original) +++ trunk/core/dbus/namespace_service/doc/dbus_samba_export.py Fri Apr 24 09:06:20 2009 @@ -30,7 +30,7 @@ share_name = share_name[1:] bus = dbus.SystemBus() - samba = bus.get_object('org.opensuse.YaST.modules', '/org/opensuse/YaST/modules/YaPI__Samba') + samba = bus.get_object('org.opensuse.YaST.modules', '/org/opensuse/YaST/modules/YaPI/Samba') call = lambda: samba.AddShare(share_name, {'path':directory, 'comment':'Exported directory ' + directory, 'read only':'Yes'}, dbus_interface='org.opensuse.YaST.Values') Modified: trunk/core/dbus/namespace_service/doc/example-users.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/example-users.py?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/doc/example-users.py (original) +++ trunk/core/dbus/namespace_service/doc/example-users.py Fri Apr 24 09:06:20 2009 @@ -3,7 +3,7 @@ # see example-arch.py # # As root: -# # polkit-auth --user $USER --grant org.opensuse.yast.modules.yapi-users.usersget +# # polkit-auth --user $USER --grant org.opensuse.yast.modules.yapi.users.usersget # work around a bug in yast2-core-2.18.6: # # polkit-auth --user $USER --grant org.opensuse.yast.module-manager.modules.import @@ -22,7 +22,7 @@ # polkit will ask retry(lambda: mm.Import('YaPI::USERS')) -Users_o = O(MOD_S, '/org/opensuse/YaST/modules/YaPI__USERS') +Users_o = O(MOD_S, '/org/opensuse/YaST/modules/YaPI/USERS') Users = I(Users_o, 'org.opensuse.YaST.Values') cfg = { "type": "system", Copied: trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy (from r56956, trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy?p2=trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy&p1=trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy&r1=56956&r2=56957&rev=56957&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi-samba.policy (original) +++ trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy Fri Apr 24 09:06:20 2009 @@ -6,7 +6,7 @@ <vendor>Novell, Inc.</vendor> http://www.novell.com - <action id="org.opensuse.yast.modules.yapi-samba.getalldirectories"> + <action id="org.opensuse.yast.modules.yapi.samba.getalldirectories"> <description>Get list of all Samba shares.</description> <message>System policy prevents the Yast DBus service from reading all Samba exports.</message> @@ -17,7 +17,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.addshare"> + <action id="org.opensuse.yast.modules.yapi.samba.addshare"> <description>Add a new Samba share.</description> <message>System policy prevents the Yast DBus service from adding a new Samba share.</message> @@ -28,7 +28,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.editshare"> + <action id="org.opensuse.yast.modules.yapi.samba.editshare"> <description>Edit properties of a Samba share.</description> <message>System policy prevents the Yast DBus service from editing properties a Samba share.</message> @@ -39,7 +39,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.deleteshare"> + <action id="org.opensuse.yast.modules.yapi.samba.deleteshare"> <description>Delete a Samba share.</description> <message>System policy prevents the Yast DBus service from deleting a Samba share.</message> @@ -50,7 +50,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.enableshare"> + <action id="org.opensuse.yast.modules.yapi.samba.enableshare"> <description>Enable or disablea a Samba share.</description> <message>System policy prevents the Yast DBus service from enabling or disabling a Samba share.</message> @@ -61,7 +61,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.getshare"> + <action id="org.opensuse.yast.modules.yapi.samba.getshare"> <description>Get details about a Samba share</description> <message>System policy prevents the Yast DBus service from reading properties of a Samba share.</message> @@ -72,7 +72,7 @@ </defaults> </action> - <action id="org.opensuse.yast.modules.yapi-samba.getshareenabled"> + <action id="org.opensuse.yast.modules.yapi.samba.getshareenabled"> <description>Get status of a Samba share (enabled/disabled)</description> <message>System policy prevents the Yast DBus service from reading status of a Samba share.</message> Modified: trunk/core/dbus/namespace_service/src/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/src/DBusModulesServer.cc?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/src/DBusModulesServer.cc (original) +++ trunk/core/dbus/namespace_service/src/DBusModulesServer.cc Fri Apr 24 09:06:20 2009 @@ -36,17 +36,41 @@ } } -void MakeValidObjectName(std::string &name) +std::string MakeValidObjectName(const std::string &name) { - for(std::string::iterator it = name.begin(); + std::string ret; + // optimization: preallocate enough space, avoid memory reallocations + ret.reserve(name.size()); + + for(std::string::const_iterator it = name.begin(); it != name.end(); ++it) { + // replace "::" -> "/" + if (*it == ':') + { + std::string::const_iterator it2(it); + it2++; + + if (it2 != name.end() && *it2 == ':') + { + ret += '/'; + it++; + continue; + } + } + if (!isupper(*it) && !islower(*it) && (*it) != '_') { - *it = '_'; + ret += '_'; + } + else + { + ret += *it; } } + + return ret; } bool DBusModulesServer::importNamespace(const std::string &nspace) @@ -72,7 +96,7 @@ { ns->initialize(); std::string objname(nspace); - MakeValidObjectName(objname); + objname = MakeValidObjectName(objname); y2milestone("Imported name space: %s, using object name: %s", nspace.c_str(), objname.c_str()); @@ -132,7 +156,7 @@ } std::string namespace_str(nspace); - MakeValidObjectName(namespace_str); + namespace_str = MakeValidObjectName(namespace_str); if (params_ok_raw) { @@ -623,13 +647,27 @@ obj.erase(obj.size() - 1); } - obj.erase(0, obj.rfind("/")); + // remove the object prefix path + obj.erase(0, sizeof(YAST_DBUS_OBJ_PREFIX)); if (!obj.empty() && obj[0] == '/') { obj.erase(obj.begin()); } + for(std::string::iterator it = obj.begin(); + it != obj.end(); + ++it) + { + // replace "/" -> "." + if (*it == '/') + { + *it = '.'; + } + } + + y2debug("Object path for PolicyKit action: %s", obj.c_str()); + if (!obj.empty()) { ret += '.' + obj; Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=56957&r1=56956&r2=56957&view=diff ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Apr 24 09:06:20 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Apr 24 08:40:07 CEST 2009 - lslezak@suse.cz + +- DBus service - better handle "::" separators in name space + string - replace it by "/" in DBus object path and "." in + PolicyKit action ID string +- 2.18.7 + +------------------------------------------------------------------- Mon Apr 20 09:50:37 CEST 2009 - jreidinger@suse.cz - add builtin list::swap for list -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org