[Release] wrt-installer_0.1.55
[framework/web/wrt-installer.git] / src / configuration_parser / widget_parser.cpp
index 71dc7a8..282c124 100644 (file)
 #include <dpl/log/log.h>
 #include <dpl/fast_delegate.h>
 #include <dpl/foreach.h>
+#include <dpl/scoped_ptr.h>
+#include <pcrecpp.h>
 #include <algorithm>
+#include <string>
 #include <cstdio>
 #include <cerrno>
 
@@ -702,7 +705,8 @@ class ContentParser : public ElementParser
             m_type = value;
             MimeTypeUtils::MimeAttributes mimeAttributes =
                 MimeTypeUtils::getMimeAttributes(value);
-            if (mimeAttributes.count(L"charset") > 0) {
+            if ((mimeAttributes.count(L"charset") > 0) && m_encoding.IsNull())
+            {
                 m_encoding = mimeAttributes[L"charset"];
             }
         } else if (attribute.name == L"encoding") {
@@ -743,132 +747,6 @@ class ContentParser : public ElementParser
     ConfigParserData& m_data;
 };
 
-class FeatureParser : public ElementParser
-{
-  public:
-    struct ParamParser : public ElementParser
-    {
-        virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
-                                            const DPL::String& /*name*/)
-        {
-            return &IgnoringParser::Create;
-        }
-
-        virtual void Accept(const XmlAttribute& attribute)
-        {
-            if (attribute.name == L"name") {
-                m_name = attribute.value;
-                NormalizeString(m_name);
-            } else if (attribute.name == L"value") {
-                m_value = attribute.value;
-                NormalizeString(m_value);
-            }
-        }
-
-        virtual void Accept(const Element& /*element*/)
-        {}
-
-        virtual void Accept(const Text& /*text*/)
-        {
-            ThrowMsg(Exception::ParseError, "param element must be empty");
-        }
-
-        virtual void Verify()
-        {
-            if (m_name.IsNull() || *m_name == L"") {
-                return;
-            }
-            if (m_value.IsNull() || *m_value == L"") {
-                return;
-            }
-
-            ConfigParserData::Param param(*m_name);
-            param.value = *m_value;
-
-            if (m_data.paramsList.find(param) == m_data.paramsList.end()) {
-                m_data.paramsList.insert(param);
-            }
-        }
-
-        ParamParser(ConfigParserData::Feature& data) :
-            ElementParser(),
-            m_data(data)
-        {}
-
-      private:
-        DPL::OptionalString m_name;
-        DPL::OptionalString m_value;
-        ConfigParserData::Feature& m_data;
-    };
-
-    virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
-                                        const DPL::String& name)
-    {
-        if (name == L"param") {
-            return DPL::MakeDelegate(this, &FeatureParser::OnParamElement);
-        } else {
-            return &IgnoringParser::Create;
-        }
-    }
-
-    virtual void Accept(const Text& /*text*/)
-    {}
-
-    virtual void Accept(const Element& /*element*/)
-    {}
-
-    virtual void Accept(const XmlAttribute& attribute)
-    {
-        if (attribute.name == L"name") {
-            m_feature.name = attribute.value;
-        } else if (attribute.name == L"required") {
-            if (attribute.value == L"false") {
-                m_feature.required = false;
-            } else {
-                m_feature.required = true;
-            }
-        }
-    }
-
-    virtual void Verify()
-    {
-        LibIri::Wrapper iri(DPL::ToUTF8String(m_feature.name).c_str());
-
-        if (m_feature.name != L"") {
-            if (iri.Validate()) {
-                if (m_data.featuresList.find(m_feature) ==
-                    m_data.featuresList.end())
-                {
-                    m_data.featuresList.insert(m_feature);
-                } else {
-                    LogDebug("Ignoring feature with name" <<
-                             DPL::ToUTF8String(m_feature.name));
-                }
-            } else {
-                if (m_feature.required) {
-                    //Throw only if required
-                    ThrowMsg(Exception::ParseError, "invalid feature IRI");
-                }
-            }
-        }
-    }
-
-    ElementParserPtr OnParamElement()
-    {
-        return ElementParserPtr(new ParamParser(m_feature));
-    }
-
-    FeatureParser(ConfigParserData& data) :
-        ElementParser(),
-        m_data(data),
-        m_feature(L"")
-    {}
-
-  private:
-    ConfigParserData& m_data;
-    ConfigParserData::Feature m_feature;
-};
-
 class PreferenceParser : public ElementParser
 {
   public:
@@ -1044,125 +922,6 @@ class SettingParser : public ElementParser
     ConfigParserData::Setting m_setting;
 };
 
-class AppServiceParser : public ElementParser
-{
-  public:
-    virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
-                                        const DPL::String& /*name*/)
-    {
-        return &IgnoringParser::Create;
-    }
-
-    virtual void Accept(const XmlAttribute& attribute)
-    {
-        if (attribute.name == L"src") {
-            m_src = attribute.value;
-        } else if (attribute.name == L"operation") {
-            m_operation = attribute.value;
-        } else if (attribute.name == L"scheme") {
-            m_scheme = attribute.value;
-        } else if (attribute.name == L"mime") {
-            m_mime = attribute.value;
-        } else if (attribute.name == L"disposition") {
-            if (attribute.value == L"inline")
-                m_disposition =
-                    ConfigParserData::ServiceInfo::Disposition::INLINE;
-        }
-    }
-
-    virtual void Accept(const Element& element)
-    {
-        LogWarning("namespace for app service = " << element.ns);
-        if (element.ns == ConfigurationNamespace::W3CWidgetNamespaceName) {
-            ThrowMsg(Exception::ParseError,
-                     "Wrong xml namespace for widget element");
-        }
-    }
-
-    virtual void Accept(const Text& /*text*/)
-    {
-        ThrowMsg(Exception::ParseError, "param element must be empty");
-    }
-
-    virtual void Verify()
-    {
-        if (m_src.IsNull()) {
-            LogWarning("service element must have target attribute");
-            return;
-        } else if (m_operation.IsNull()) {
-            LogWarning("service element must have operation attribute");
-            return;
-        }
-        NormalizeString(m_src);
-        NormalizeString(m_operation);
-        NormalizeString(m_scheme);
-        NormalizeString(m_mime);
-
-        // exception
-        DPL::String ignoreUri(L"file");
-
-        if (!m_scheme.IsNull() && *m_scheme == ignoreUri)
-        {
-            LogInfo("exception : '" << *m_scheme << "' scheme will be ignored.");
-            m_scheme = DPL::OptionalString::Null;
-        }
-
-        // verify duplicate element
-        DPL::String wildString(L"*/*");
-        DPL::String nullString(L"");
-        ConfigParserData::ServiceInfo serviceInfo(
-            m_src.IsNull() ? nullString : *m_src,
-            m_operation.IsNull() ? nullString : *m_operation,
-            m_scheme.IsNull() ? nullString : *m_scheme,
-            m_mime.IsNull() ? nullString : *m_mime,
-            m_disposition);
-
-        FOREACH(iterator, m_data.appServiceList) {
-            if (iterator->m_operation == serviceInfo.m_operation &&
-                // check scheme
-                (iterator->m_scheme == serviceInfo.m_scheme ||
-                 // check input scheme is "*/*" case
-                 (iterator->m_scheme == wildString &&
-                  serviceInfo.m_scheme != nullString) ||
-                 // check iterator scheme is "*/*" case
-                 (serviceInfo.m_scheme == wildString &&
-                  iterator->m_scheme != nullString)) &&
-
-                (iterator->m_mime == serviceInfo.m_mime ||
-                 // check input mime is "*/*" case
-                 (iterator->m_mime == wildString &&
-                  serviceInfo.m_mime != nullString) ||
-                 // check iterator mime is "*/*" case
-                 (serviceInfo.m_mime == wildString &&
-                  iterator->m_mime != nullString)))
-            {
-                ThrowMsg(Exception::ParseError,
-                         "service operation is duplicated " +
-                         DPL::ToUTF8String(*m_operation));
-            }
-        }
-        m_data.appServiceList.push_back(serviceInfo);
-    }
-
-    AppServiceParser(ConfigParserData& data) :
-        ElementParser(),
-        m_src(DPL::OptionalString::Null),
-        m_operation(DPL::OptionalString::Null),
-        m_scheme(DPL::OptionalString::Null),
-        m_mime(DPL::OptionalString::Null),
-        m_disposition(ConfigParserData::ServiceInfo::Disposition::WINDOW),
-        m_data(data)
-    {}
-
-  private:
-    DPL::OptionalString m_src;
-    DPL::OptionalString m_operation;
-    DPL::OptionalString m_scheme;
-    DPL::OptionalString m_mime;
-    ConfigParserData::ServiceInfo::Disposition m_disposition;
-    ConfigParserData& m_data;
-};
-
 class AppControlParser : public ElementParser
 {
   public:
@@ -1507,34 +1266,84 @@ class ApplicationParser : public ElementParser
 
     virtual void Verify()
     {
+        VerifyIdAndPackage();
+        VerifyVersion();
+    }
+
+    ApplicationParser(ConfigParserData& data) :
+        ElementParser(),
+        m_data(data),
+        m_id(DPL::OptionalString::Null),
+        m_version(DPL::OptionalString::Null),
+        m_properNamespace(false)
+    {}
+
+  private:
+    void VerifyIdAndPackage()
+    {
+        if (!m_package)
+        {
+            ThrowMsg(Exception::ParseError,
+                     "application element must have package attribute");
+        }
+        else
+        {
+            pcrecpp::RE re(REGEXP_PACKAGE);
+            if (!re.FullMatch(DPL::ToUTF8String(*m_package)))
+            {
+                ThrowMsg(Exception::ParseError,
+                         "invalid format of package attribute");
+            }
+        }
+
         if (!m_id) {
             ThrowMsg(Exception::ParseError,
                      "application element must have id attribute");
         }
-
-        if (!!m_package) {
-            m_data.tizenPkgId = m_package;
+        else
+        {
+            std::string package;
+            pcrecpp::RE re(REGEXP_ID);
+            if (!re.FullMatch(DPL::ToUTF8String(*m_id), &package))
+            {
+                ThrowMsg(Exception::ParseError,
+                         "invalid format of id attribute");
+            }
+            if (package != DPL::ToUTF8String(*m_package))
+            {
+                ThrowMsg(Exception::ParseError,
+                         "invalid package prefix in id attribute");
+            }
         }
 
-        if (!m_version) {
+        m_data.tizenAppId = m_id;
+        m_data.tizenPkgId = m_package;
+    }
+
+    void VerifyVersion()
+    {
+        if (!m_version)
+        {
             ThrowMsg(Exception::ParseError,
                      "application element must have required_version attribute");
         }
+        else
+        {
+            pcrecpp::RE re(REGEXP_VERSION);
+            if (!re.FullMatch(DPL::ToUTF8String(*m_version)))
+            {
+                ThrowMsg(Exception::ParseError,
+                         "invalid format of version attribute");
+            }
+        }
 
-        //TODO check if id and version format is right
-        m_data.tizenAppId = m_id;
         m_data.tizenMinVersionRequired = m_version;
     }
 
-    ApplicationParser(ConfigParserData& data) :
-        ElementParser(),
-        m_data(data),
-        m_id(DPL::OptionalString::Null),
-        m_version(DPL::OptionalString::Null),
-        m_properNamespace(false)
-    {}
+    static const char* const REGEXP_PACKAGE;
+    static const char* const REGEXP_ID;
+    static const char* const REGEXP_VERSION;
 
-  private:
     ConfigParserData& m_data;
     DPL::OptionalString m_id;
     DPL::OptionalString m_package;
@@ -1542,6 +1351,10 @@ class ApplicationParser : public ElementParser
     bool m_properNamespace;
 };
 
+const char* const ApplicationParser::REGEXP_PACKAGE = "[0-9A-Za-z]{10}";
+const char* const ApplicationParser::REGEXP_ID = "([0-9A-Za-z]{10})\\.[0-9A-Za-z]{1,52}";
+const char* const ApplicationParser::REGEXP_VERSION = "\\d+\\.\\d+(\\.\\d+)?";
+
 class SplashParser : public ElementParser
 {
   public:
@@ -1661,7 +1474,6 @@ class PrivilegeParser : public ElementParser
                 m_privilege.name = attribute.value;
             }
         }
-        m_feature.required = false;
     }
 
     virtual void Verify()
@@ -1676,7 +1488,7 @@ class PrivilegeParser : public ElementParser
                     m_data.featuresList.insert(m_feature);
                 } else {
                     LogDebug("Ignoring feature with name" <<
-                             DPL::ToUTF8String(m_feature.name));
+                        DPL::ToUTF8String(m_feature.name));
                 }
             }
         }
@@ -1929,6 +1741,8 @@ class AppWidgetParser : public ElementParser
                         m_width = attribute.value;
                     } else if (attribute.name == L"height") {
                         m_height = attribute.value;
+                    } else if (attribute.name == L"fast-open") {
+                        m_fastOpen= attribute.value;
                     }
                 }
             }
@@ -1950,6 +1764,7 @@ class AppWidgetParser : public ElementParser
                 m_data.m_pdSrc = m_src;
                 m_data.m_pdWidth = m_width;
                 m_data.m_pdHeight = m_height;
+                m_data.m_pdFastOpen = m_fastOpen;
             }
 
             explicit PdParser(
@@ -1963,6 +1778,7 @@ class AppWidgetParser : public ElementParser
             DPL::String m_src;
             DPL::String m_width;
             DPL::String m_height;
+            DPL::String m_fastOpen;
 
             bool m_properNamespace;
             ConfigParserData::LiveboxInfo::BoxContentInfo& m_data;
@@ -2130,6 +1946,82 @@ class AppWidgetParser : public ElementParser
     bool m_properNamespace;
 };
 
+class AllowNavigationParser : public ElementParser
+{
+  public:
+    AllowNavigationParser(ConfigParserData& data) :
+      ElementParser(),
+      m_data(data),
+      m_properNamespace(false)
+    {}
+
+    virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
+                                        const DPL::String& /*name*/)
+    {
+        return &IgnoringParser::Create;
+    }
+
+    virtual void Accept(const Element& element)
+    {
+        if (element.ns == ConfigurationNamespace::TizenWebAppNamespaceName) {
+            m_properNamespace = true;
+        }
+    }
+
+    virtual void Accept(const Text& text)
+    {
+        if (m_properNamespace) {
+            m_origin = text.value;
+        }
+    }
+
+    virtual void Accept(const XmlAttribute& /*attribute*/)
+    {
+    }
+
+    virtual void Verify()
+    {
+        if (m_origin.IsNull()) {
+            LogWarning("data is empty");
+            return;
+        }
+
+        char* data = strdup(DPL::ToUTF8String(*m_origin).c_str());
+        char* ptr = strtok(data," ");
+        while (ptr != NULL) {
+            std::string origin = ptr;
+            ptr = strtok(NULL," ");
+            if(origin == "*") {
+                ConfigParserData::AllowNavigationInfo info(L"*", L"*");
+                m_data.allowNavigationInfoList.push_back(info);
+                continue;
+            }
+
+            DPL::ScopedPtr<iri_t> iri(iri_parse(origin.c_str()));
+            if (!iri->host || strlen(iri->host) == 0) {
+                // input origin should has schem and host
+                // in case of file scheme path is filled
+                // "http://"
+                LogWarning("input origin isn't verified");
+                continue;
+            }
+            DPL::String scheme = L"*";
+            if (iri->scheme && strlen(iri->scheme) != 0) {
+                scheme = DPL::FromUTF8String(iri->scheme);
+            }
+            ConfigParserData::AllowNavigationInfo info(
+                scheme,
+                DPL::FromUTF8String(iri->host));
+            m_data.allowNavigationInfoList.push_back(info);
+        }
+    }
+
+  private:
+    DPL::OptionalString m_origin;
+    ConfigParserData& m_data;
+    bool m_properNamespace;
+};
+
 class CspParser : public ElementParser
 {
   public:
@@ -2220,6 +2112,278 @@ class CspReportOnlyParser : public ElementParser
     DPL::OptionalString m_policy;
 };
 
+class AccountParser : public ElementParser
+{
+  public:
+    struct AccountProviderParser : public ElementParser
+    {
+      public:
+
+          struct IconParser : public ElementParser
+        {
+            public:
+                virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
+                        const DPL::String& /*name*/)
+                {
+                    return &IgnoringParser::Create;
+                }
+
+                virtual void Accept(const Text& text)
+                {
+                    if (text.value == L"") {
+                        return;
+                    }
+                    m_value = text.value;
+                }
+
+                virtual void Accept(const Element& /*element*/)
+                {}
+
+                virtual void Accept(const XmlAttribute& attribute)
+                {
+                    if (attribute.name == L"section") {
+                        if (attribute.value == L"account") {
+                            m_type = ConfigParserData::IconSectionType::DefaultIcon;
+                        } else if (attribute.value == L"account-small") {
+                            m_type = ConfigParserData::IconSectionType::SmallIcon;
+                        }
+                    }
+                }
+
+                virtual void Verify()
+                {
+                    if (m_value.IsNull() || *m_value == L"") {
+                        return;
+                    }
+
+                    std::pair<ConfigParserData::IconSectionType, DPL::String> icon;
+                    icon.first = m_type;
+                    icon.second = *m_value;
+
+                    m_data.m_iconSet.insert(icon);
+                }
+
+                IconParser(ConfigParserData::AccountProvider& data) :
+                    ElementParser(),
+                    m_properNamespace(false),
+                    m_type(ConfigParserData::DefaultIcon),
+                    m_data(data)
+            {}
+
+            private:
+                bool m_properNamespace;
+                ConfigParserData::IconSectionType m_type;
+                ConfigParserData::AccountProvider& m_data;
+                DPL::OptionalString m_value;
+        };
+
+          struct DisplayNameParser : public ElementParser
+        {
+            public:
+                virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
+                        const DPL::String& /*name*/)
+                {
+                    return &IgnoringParser::Create;
+                }
+
+                virtual void Accept(const Text& text)
+                {
+                    if (text.value == L"") {
+                        return;
+                    }
+                    m_value = text.value;
+                }
+
+                virtual void Accept(const Element& element)
+                {
+                    m_lang = element.lang;
+                    m_value= L"";
+                }
+
+                virtual void Accept(const XmlAttribute& /*attribute*/)
+                {}
+
+                virtual void Verify()
+                {
+                    if (m_value.IsNull() || *m_value == L"") {
+                        return;
+                    }
+
+                    std::pair<DPL::String, DPL::String> name;
+                    name.first = *m_lang;
+                    name.second = *m_value;
+
+                    m_data.m_displayNameSet.insert(name);
+                }
+
+                DisplayNameParser(ConfigParserData::AccountProvider& data) :
+                    ElementParser(),
+                    m_properNamespace(false),
+                    m_data(data)
+            {}
+
+            private:
+                bool m_properNamespace;
+                DPL::OptionalString m_lang;
+                DPL::OptionalString m_value;
+                ConfigParserData::AccountProvider& m_data;
+        };
+
+          struct CapabilityParser : public ElementParser
+        {
+            public:
+                virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
+                        const DPL::String& /*name*/)
+                {
+                    return &IgnoringParser::Create;
+                }
+
+                virtual void Accept(const Text& text)
+                {
+                    if (text.value == L"") {
+                        return;
+                    }
+                    m_value = text.value;
+                }
+
+                virtual void Accept(const Element& /*element*/)
+                {}
+
+                virtual void Accept(const XmlAttribute& /*attribute*/)
+                {}
+
+                virtual void Verify()
+                {
+                    if (m_value.IsNull() || *m_value == L"") {
+                        return;
+                    }
+                    m_data.m_capabilityList.push_back(*m_value);
+                }
+
+                CapabilityParser(ConfigParserData::AccountProvider& data) :
+                    ElementParser(),
+                    m_properNamespace(false),
+                    m_data(data)
+            {}
+
+            private:
+                bool m_properNamespace;
+                DPL::OptionalString m_value;
+                ConfigParserData::AccountProvider& m_data;
+        };
+          virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
+                  const DPL::String& name)
+          {
+              if (name == L"icon") {
+                  return DPL::MakeDelegate(this, &AccountProviderParser::OnIconElement);
+              } else if (name == L"display-name") {
+                  return DPL::MakeDelegate(this,
+                          &AccountProviderParser::OnDisplayNameElement);
+              } else if (name == L"capability") {
+                  return DPL::MakeDelegate(this, &AccountProviderParser::OnCapabilityElement);
+              } else {
+                  return &IgnoringParser::Create;
+              }
+          }
+
+          virtual void Accept(const Text& /*text*/)
+          {}
+
+          virtual void Accept(const Element& /*element*/)
+          {}
+
+          virtual void Accept(const XmlAttribute& attribute)
+          {
+              if (attribute.name == L"multiple-accounts-support") {
+                  if (attribute.value == L"") {
+                      return;
+                  }
+
+                  if (attribute.value == L"ture") {
+                      m_multiSupport = true;
+                  }
+              }
+          }
+
+          virtual void Verify()
+          {
+              m_data.m_multiAccountSupport = m_multiSupport;
+          }
+
+          ElementParserPtr OnIconElement()
+          {
+              return ElementParserPtr(new IconParser(m_data));
+          }
+
+          ElementParserPtr OnDisplayNameElement()
+          {
+              return ElementParserPtr(new DisplayNameParser(m_data));
+          }
+
+          ElementParserPtr OnCapabilityElement()
+          {
+              return ElementParserPtr(new CapabilityParser(m_data));
+          }
+
+          AccountProviderParser(ConfigParserData::AccountProvider& data) :
+              ElementParser(),
+              m_properNamespace(false),
+              m_multiSupport(false),
+              m_data(data)
+        {}
+
+      private:
+          bool m_properNamespace;
+          bool m_multiSupport;
+          ConfigParserData::AccountProvider& m_data;
+    };
+
+    virtual ActionFunc GetElementParser(const DPL::String& /*ns*/,
+            const DPL::String& name)
+    {
+        if (name == L"account-provider") {
+            return DPL::MakeDelegate(this, &AccountParser::OnProviderElement);
+        } else {
+            return &IgnoringParser::Create;
+        }
+    }
+
+    virtual void Accept(const Element& element)
+    {
+        if (element.ns == ConfigurationNamespace::TizenWebAppNamespaceName) {
+            m_properNamespace = true;
+        }
+    }
+
+    virtual void Accept(const XmlAttribute& /*attribute*/)
+    {}
+
+    virtual void Accept(const Text& /*text*/)
+    {}
+
+    virtual void Verify()
+    {}
+
+    ElementParserPtr OnProviderElement()
+    {
+        return ElementParserPtr(new AccountProviderParser(m_account));
+    }
+
+    AccountParser(ConfigParserData& data) :
+        ElementParser(),
+        m_data(data),
+        m_account(data.accountProvider),
+        m_properNamespace(false),
+        m_multiSupport(false)
+    {}
+
+  private:
+    ConfigParserData& m_data;
+    ConfigParserData::AccountProvider& m_account;
+    bool m_properNamespace;
+    bool m_multiSupport;
+};
+
 ElementParser::ActionFunc WidgetParser::GetElementParser(
     const DPL::String& /*ns*/,
     const DPL::String&
@@ -2247,16 +2411,11 @@ WidgetParser::WidgetParser(ConfigParserData& data) :
     m_map[L"icon"] = DPL::MakeDelegate(this, &WidgetParser::OnIconElement);
     m_map[L"content"] =
         DPL::MakeDelegate(this, &WidgetParser::OnContentElement);
-    m_map[L"feature"] =
-        DPL::MakeDelegate(this, &WidgetParser::OnFeatureElement);
     m_map[L"preference"] =
         DPL::MakeDelegate(this, &WidgetParser::OnPreferenceElement);
     m_map[L"link"] = DPL::MakeDelegate(this, &WidgetParser::OnLinkElement);
     m_map[L"setting"] =
         DPL::MakeDelegate(this, &WidgetParser::OnSettingElement);
-    // TODO: appservice will be removed
-    m_map[L"appservice"] = DPL::MakeDelegate(this,
-                                             &WidgetParser::OnAppServiceElement);
     m_map[L"application"] = DPL::MakeDelegate(
             this,
             &WidgetParser::
@@ -2274,15 +2433,20 @@ WidgetParser::WidgetParser(ConfigParserData& data) :
                                            &WidgetParser::OnCategoryElement);
     m_map[L"app-widget"] = DPL::MakeDelegate(this, &WidgetParser::OnAppWidgetElement);
 #ifdef CSP_ENABLED
-    m_map[L"Content-Security-Policy"] = DPL::MakeDelegate(
+    m_map[L"content-security-policy"] = DPL::MakeDelegate(
             this,
             &WidgetParser::
                 OnCspElement);
-    m_map[L"Content-Security-Policy-Report-Only"] = DPL::MakeDelegate(
+    m_map[L"content-security-policy-report-only"] = DPL::MakeDelegate(
             this,
             &WidgetParser::
                 OnCspReportOnlyElement);
 #endif
+#ifdef ALLOW_NAVIGATION_ENABLED
+    m_map[L"allow-navigation"] =
+        DPL::MakeDelegate(this, &WidgetParser::OnAllowNavigationElement);
+#endif
+    m_map[L"account"] = DPL::MakeDelegate(this, &WidgetParser::OnAccountElement);
 }
 
 ElementParserPtr WidgetParser::OnNameElement()
@@ -2320,11 +2484,6 @@ ElementParserPtr WidgetParser::OnContentElement()
     return ElementParserPtr(new ContentParser(m_data));
 }
 
-ElementParserPtr WidgetParser::OnFeatureElement()
-{
-    return ElementParserPtr(new FeatureParser(m_data));
-}
-
 ElementParserPtr WidgetParser::OnPreferenceElement()
 {
     return ElementParserPtr(new PreferenceParser(m_data));
@@ -2360,11 +2519,6 @@ ElementParserPtr WidgetParser::OnPrivilegeElement()
     return ElementParserPtr(new PrivilegeParser(m_data));
 }
 
-ElementParserPtr WidgetParser::OnAppServiceElement()
-{
-    return ElementParserPtr(new AppServiceParser(m_data));
-}
-
 ElementParserPtr WidgetParser::OnAppControlElement()
 {
     return ElementParserPtr(new AppControlParser(m_data));
@@ -2390,6 +2544,16 @@ ElementParserPtr WidgetParser::OnCspReportOnlyElement()
     return ElementParserPtr(new CspReportOnlyParser(m_data));
 }
 
+ElementParserPtr WidgetParser::OnAllowNavigationElement()
+{
+    return ElementParserPtr(new AllowNavigationParser(m_data));
+}
+
+ElementParserPtr WidgetParser::OnAccountElement()
+{
+    return ElementParserPtr(new AccountParser(m_data));
+}
+
 void WidgetParser::Accept(const Element& element)
 {
     if (element.ns != ConfigurationNamespace::W3CWidgetNamespaceName &&