← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde-runtime/precise-updates

« back to all changes in this revision

Viewing changes to kpasswdserver/kpasswdserver.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2014-11-20 15:46:42 UTC
  • mfrom: (18.1.5 precise-proposed)
  • Revision ID: package-import@ubuntu.com-20141120154642-hyesdbuvsk78ihtz
Tags: 4:4.8.5-0ubuntu0.3
https://launchpad.net/bugs/1393479
* SECURITY UPDATE: Insufficient Input Validation By IO Slaves and
  Webkit Part
 - Add upstream_CVE-2014-8600.diff to escape protocol twice: once
   for i18n, and once for HTML
 - https://www.kde.org/info/security/advisory-20141113-1.txt
 - CVE-2014-8600
 - LP: #1393479

Show diffs side-by-side

added added

removed removed

Lines of Context:
kpasswdserver/kpasswdserver.cpp
46
46
    )
47
47
K_EXPORT_PLUGIN(KPasswdServerFactory("kpasswdserver"))
48
48
 
49
 
#define AUTHINFO_EXTRAFIELD_DOMAIN "domain"
50
 
#define AUTHINFO_EXTRAFIELD_ANONYMOUS "anonymous"
51
 
#define AUTHINFO_EXTRAFIELD_BYPASS_CACHE_AND_KWALLET "bypass-cache-and-kwallet"
 
49
#define AUTHINFO_EXTRAFIELD_DOMAIN QLatin1String("domain")
 
50
#define AUTHINFO_EXTRAFIELD_ANONYMOUS QLatin1String("anonymous")
 
51
#define AUTHINFO_EXTRAFIELD_BYPASS_CACHE_AND_KWALLET QLatin1String("bypass-cache-and-kwallet")
52
52
#define AUTHINFO_EXTRAFIELD_SKIP_CACHING_ON_QUERY QLatin1String("skip-caching-on-query")
 
53
#define AUTHINFO_EXTRAFIELD_HIDE_USERNAME_INPUT QLatin1String("hide-username-line")
53
54
 
54
55
static int debugArea() { static int s_area = KDebug::registerArea("KPasswdServer"); return s_area; }
55
56
 
577
578
                dialogFlags |= KPasswordDialog::ShowAnonymousLoginCheckBox;
578
579
            }
579
580
 
580
 
            dialogFlags |= KPasswordDialog::ShowUsernameLine;
 
581
            if (!info.getExtraField(AUTHINFO_EXTRAFIELD_HIDE_USERNAME_INPUT).toBool())
 
582
            {
 
583
                dialogFlags |= KPasswordDialog::ShowUsernameLine;
 
584
            }
581
585
 
582
586
            // If wallet is not enabled and the caller explicitly request for it,
583
587
            // do not show the keep password checkbox.