[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    D14035: Unbreak SSH agent support for SSH VPN tunnels.
From:       Jan Grulich <noreply () phabricator ! kde ! org>
Date:       2018-07-13 13:32:09
Message-ID: f3b7f87dc47bbd4dc894dd8010db71a2 () localhost ! localdomain
[Download RAW message or body]

[Attachment #2 (text/plain)]

jgrulich added inline comments.

INLINE COMMENTS

> secretagent.cpp:363
> +        NetworkManager::VpnSetting::Ptr vpnSetting = \
> connectionSettings->setting(NetworkManager::Setting::Vpn).dynamicCast<NetworkManager::VpnSetting>();
>  +        if (vpnSetting->serviceType() == "org.freedesktop.NetworkManager.ssh" && \
> vpnSetting->data()["auth-type"] == "ssh-agent") { +            QString authSock = \
> qgetenv("SSH_AUTH_SOCK");

Use QLatin1String()

> secretagent.cpp:367
> +
> +            if (!authSock.isEmpty()) {
> +                NMStringMap secrets;

When SSH_AUTH_SOCK is empty, it shouldn't continue asking for the password, you \
should instead report an error.

> secretagent.cpp:372
> +                QVariantMap secretData;
> +                secretData.insert("secrets", \
> QVariant::fromValue<NMStringMap>(secrets)); +                \
> request.connection[request.setting_name] = secretData;

Use QLatin1String()

REPOSITORY
  R116 Plasma Network Management Applet

REVISION DETAIL
  https://phabricator.kde.org/D14035

To: catherinez, #plasma, jgrulich
Cc: plasma-devel, #plasma, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, \
jensreuterberg, abetts, sebas, apol, mart


[Attachment #3 (text/html)]

<table><tr><td style="">jgrulich added inline comments.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: \
right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: \
#F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: \
inline-block; border: 1px solid rgba(71,87,120,.2);" \
href="https://phabricator.kde.org/D14035">View Revision</a></tr></table><br \
/><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div \
style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; \
background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 \
1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; \
overflow: hidden;"><a style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D14035#inline-74105">View Inline</a><span \
style="color: #4b4d51; font-weight: bold;">secretagent.cpp:363</span></div> <div \
style="font: 11px/15px &quot;Menlo&quot;, &quot;Consolas&quot;, &quot;Monaco&quot;, \
monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        \
<span class="n">NetworkManager</span><span style="color: #aa2211">::</span><span \
class="n">VpnSetting</span><span style="color: #aa2211">::</span><span \
class="n">Ptr</span> <span class="n">vpnSetting</span> <span style="color: \
#aa2211">=</span> <span class="n">connectionSettings</span><span style="color: \
#aa2211">-&gt;</span><span class="n">setting</span><span class="p">(</span><span \
class="n">NetworkManager</span><span style="color: #aa2211">::</span><span \
class="n">Setting</span><span style="color: #aa2211">::</span><span \
class="n">Vpn</span><span class="p">).</span><span class="n">dynamicCast</span><span \
style="color: #aa2211">&lt;</span><span class="n">NetworkManager</span><span \
style="color: #aa2211">::</span><span class="n">VpnSetting</span><span style="color: \
#aa2211">&gt;</span><span class="p">();</span> </div><div style="padding: 0 8px; \
margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: \
#aa4000">if</span> <span class="p">(</span><span class="n">vpnSetting</span><span \
style="color: #aa2211">-&gt;</span><span class="n">serviceType</span><span \
class="p">()</span> <span style="color: #aa2211">==</span> <span style="color: \
#766510">&quot;org.freedesktop.NetworkManager.ssh&quot;</span> <span style="color: \
#aa2211">&amp;&amp;</span> <span class="n">vpnSetting</span><span style="color: \
#aa2211">-&gt;</span><span class="n">data</span><span class="p">()[</span><span \
style="color: #766510">&quot;auth-type&quot;</span><span class="p">]</span> <span \
style="color: #aa2211">==</span> <span style="color: \
#766510">&quot;ssh-agent&quot;</span><span class="p">)</span> <span \
class="p">{</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
rgba(151, 234, 151, .6);">            <span class="n">QString</span> <span \
class="n">authSock</span> <span style="color: #aa2211">=</span> <span \
class="n">qgetenv</span><span class="p">(</span><span style="color: \
#766510">&quot;SSH_AUTH_SOCK&quot;</span><span class="p">);</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Use \
QLatin1String()</p></div></div><br /><div style="border: 1px solid #C7CCD9; \
border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: \
#e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: \
#74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: \
right; text-decoration: none;" \
href="https://phabricator.kde.org/D14035#inline-74107">View Inline</a><span \
style="color: #4b4d51; font-weight: bold;">secretagent.cpp:367</span></div> <div \
style="font: 11px/15px &quot;Menlo&quot;, &quot;Consolas&quot;, &quot;Monaco&quot;, \
monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">          \
<span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: \
#aa2211">!</span><span class="n">authSock</span><span class="p">.</span><span \
class="n">isEmpty</span><span class="p">())</span> <span class="p">{</span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, \
.6);">                <span class="n">NMStringMap</span> <span \
class="n">secrets</span><span class="p">;</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">When \
SSH_AUTH_SOCK is empty, it shouldn&#039;t continue asking for the password, you \
should instead report an error.</p></div></div><br /><div style="border: 1px solid \
#C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; \
border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div \
style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a \
style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D14035#inline-74106">View Inline</a><span \
style="color: #4b4d51; font-weight: bold;">secretagent.cpp:372</span></div> <div \
style="font: 11px/15px &quot;Menlo&quot;, &quot;Consolas&quot;, &quot;Monaco&quot;, \
monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">          \
<span class="n">QVariantMap</span> <span class="n">secretData</span><span \
class="p">;</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
rgba(151, 234, 151, .6);">                <span class="n">secretData</span><span \
class="p">.</span><span class="n">insert</span><span class="p">(</span><span \
style="color: #766510">&quot;secrets&quot;</span><span class="p">,</span> <span \
class="n">QVariant</span><span style="color: #aa2211">::</span><span \
class="n">fromValue</span><span style="color: #aa2211">&lt;</span><span \
class="n">NMStringMap</span><span style="color: #aa2211">&gt;</span><span \
class="p">(</span><span class="n">secrets</span><span class="p">));</span> </div><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">          \
<span class="n">request</span><span class="p">.</span><span \
class="n">connection</span><span class="p">[</span><span \
class="n">request</span><span class="p">.</span><span \
class="n">setting_name</span><span class="p">]</span> <span style="color: \
#aa2211">=</span> <span class="n">secretData</span><span class="p">;</span> \
</div></div></div> <div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; \
margin: 8px;">Use QLatin1String()</p></div></div></div></div></div><br \
/><div><strong>REPOSITORY</strong><div><div>R116 Plasma Network Management \
Applet</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a \
href="https://phabricator.kde.org/D14035">https://phabricator.kde.org/D14035</a></div></div><br \
/><div><strong>To: </strong>catherinez, Plasma, jgrulich<br /><strong>Cc: \
</strong>plasma-devel, Plasma, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, \
jensreuterberg, abetts, sebas, apol, mart<br /></div>



[prev in list] [next in list] [prev in thread] [next in thread]