revert: "feat: zimlet code cleanup (#310)" (#344)

This reverts commit 8d8da00. rif: [CO-845]
zextras · Sep 28, 2023 · 93cead1 · 93cead1
1 parent b79772d
commit 93cead1
Show file tree

Hide file tree

Showing 183 changed files with 16,747 additions and 5,825 deletions.
diff --git a/carbonio-jetty-libs/pom.xml b/carbonio-jetty-libs/pom.xml
@@ -98,6 +98,10 @@
       <artifactId>jamm</artifactId>
       <version>0.2.5</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.zafarkhaja</groupId>
+      <artifactId>java-semver</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -218,6 +222,10 @@
       <groupId>com.unboundid</groupId>
       <artifactId>unboundid-ldapsdk</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.platform.yui</groupId>
+      <artifactId>yuicompressor</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>

diff --git a/client/src/main/java/com/zimbra/client/ZGetInfoResult.java b/client/src/main/java/com/zimbra/client/ZGetInfoResult.java
@@ -98,6 +98,11 @@ public Map<String, List<String>> getAttrs() {
     return MapUtil.multimapToMapOfLists(data.getAttrsMultimap());
   }
 
+  public Map<String, List<String>> getZimletProps() {
+    return MapUtil.multimapToMapOfLists(
+        data.getPropsMultimap(ZAttrProvisioning.A_zimbraZimletUserProperties));
+  }
+
   /***
    *
    * @return Set of all lowercased email addresses for this account, including primary name and any aliases.

diff --git a/client/src/main/java/com/zimbra/client/ZMailbox.java b/client/src/main/java/com/zimbra/client/ZMailbox.java
@@ -254,7 +254,7 @@ public class ZMailbox implements ToZJSONObject, MailboxStore {
 
   public static final String CONTACT_IMPORT_TYPE_CSV = "csv";
 
-  private static final Set<InfoSection> NOT_ZIMLETS =
+  private static Set<InfoSection> NOT_ZIMLETS =
       Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(InfoSection.zimlets)));
 
   private ZAuthToken mAuthToken;

diff --git a/common/src/main/java/com/zimbra/common/account/ZAttrProvisioning.java b/common/src/main/java/com/zimbra/common/account/ZAttrProvisioning.java
@@ -7168,8 +7168,7 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraFeatureManageSMIMECertificateEnabled = "zimbraFeatureManageSMIMECertificateEnabled";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: enable
-     * end-user to manage zimlets
+     * enable end-user to manage zimlets
      *
      * @since ZCS 6.0.2
      */
@@ -13526,7 +13525,6 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraPrefDeleteInviteOnReply = "zimbraPrefDeleteInviteOnReply";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * zimlets user does not want to see in the UI
      *
      * @since ZCS 6.0.5
@@ -14731,7 +14729,6 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraPrefWhenSentToEnabled = "zimbraPrefWhenSentToEnabled";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * zimlets user wants to see in the UI
      *
      * @since ZCS 6.0.0_BETA1
@@ -14740,7 +14737,6 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraPrefZimlets = "zimbraPrefZimlets";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * whether or not zimlet tree is expanded
      *
      * @since ZCS 5.0.5
@@ -17959,7 +17955,6 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraXMPPServerDialbackKey = "zimbraXMPPServerDialbackKey";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * ZimbraX compatible semantic version expression
      *
      * @since ZCS 8.8.9
@@ -17976,23 +17971,20 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraYahooId = "zimbraYahooId";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: List
-     * of Zimlets available to this COS Values can be prefixed with ! or + or
-     * - !: mandatory + (or no prefix): enabled by default -: disabled by
-     * default
+     * List of Zimlets available to this COS Values can be prefixed with ! or
+     * + or - !: mandatory + (or no prefix): enabled by default -: disabled
+     * by default
      */
     @ZAttr(id=291)
     public static final String A_zimbraZimletAvailableZimlets = "zimbraZimletAvailableZimlets";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: The
-     * content object section in the Zimlet description
+     * The content object section in the Zimlet description
      */
     @ZAttr(id=288)
     public static final String A_zimbraZimletContentObject = "zimbraZimletContentObject";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * whether zimlets that send sensitive data are disabled in
      * &quot;mixed&quot; zimbraMailMode
      *
@@ -18002,16 +17994,14 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraZimletDataSensitiveInMixedModeDisabled = "zimbraZimletDataSensitiveInMixedModeDisabled";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: Zimlet
-     * description
+     * Zimlet description
      */
     @ZAttr(id=283)
     public static final String A_zimbraZimletDescription = "zimbraZimletDescription";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: List
-     * of Zimlets available to this domain. Zimlets available to accounts in
-     * the domain is the union of account/cos attribute
+     * List of Zimlets available to this domain. Zimlets available to
+     * accounts in the domain is the union of account/cos attribute
      * zimbraZimletAvailableZimlets and this attribute. See
      * zimbraZimletAvailableZimlets for value format.
      *
@@ -18021,42 +18011,36 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraZimletDomainAvailableZimlets = "zimbraZimletDomainAvailableZimlets";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * whether this Zimlet is enabled
      */
     @ZAttr(id=301)
     public static final String A_zimbraZimletEnabled = "zimbraZimletEnabled";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: The
-     * handler class for server side Zimlet extension
+     * The handler class for server side Zimlet extension
      */
     @ZAttr(id=286)
     public static final String A_zimbraZimletHandlerClass = "zimbraZimletHandlerClass";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: The
-     * global config for the Zimlet
+     * The global config for the Zimlet
      */
     @ZAttr(id=287)
     public static final String A_zimbraZimletHandlerConfig = "zimbraZimletHandlerConfig";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * Whether server side keyword indexing enabled
      */
     @ZAttr(id=284)
     public static final String A_zimbraZimletIndexingEnabled = "zimbraZimletIndexingEnabled";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * Whether this zimlet is an extension
      */
     @ZAttr(id=304)
     public static final String A_zimbraZimletIsExtension = "zimbraZimletIsExtension";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * Whether to enable JSP compilation for Zimlets (i.e. for /zimlet
      * webapp)
      *
@@ -18066,14 +18050,13 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraZimletJspEnabled = "zimbraZimletJspEnabled";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: Server
-     * side object keyword used for indexing and search for this Zimlet
+     * Server side object keyword used for indexing and search for this
+     * Zimlet
      */
     @ZAttr(id=281)
     public static final String A_zimbraZimletKeyword = "zimbraZimletKeyword";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * Whether to load zimlets synchronously in the web client. If set to
      * TRUE, users are not allowed to use the core app before zimlets are
      * loaded. If set to FALSE, zimlets are loaded in the background and
@@ -18086,58 +18069,50 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraZimletLoadSynchronously = "zimbraZimletLoadSynchronously";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: The
-     * panel item section in the Zimlet description
+     * The panel item section in the Zimlet description
      */
     @ZAttr(id=289)
     public static final String A_zimbraZimletPanelItem = "zimbraZimletPanelItem";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: Object
-     * match priority
+     * Object match priority
      */
     @ZAttr(id=302)
     public static final String A_zimbraZimletPriority = "zimbraZimletPriority";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: URL of
-     * extra scripts used by the Zimlet
+     * URL of extra scripts used by the Zimlet
      */
     @ZAttr(id=290)
     public static final String A_zimbraZimletScript = "zimbraZimletScript";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: Regex
-     * of content object
+     * Regex of content object
      */
     @ZAttr(id=292)
     public static final String A_zimbraZimletServerIndexRegex = "zimbraZimletServerIndexRegex";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * Whether store is matched for this type
      */
     @ZAttr(id=285)
     public static final String A_zimbraZimletStoreMatched = "zimbraZimletStoreMatched";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: Zimlet
-     * target apps
+     * Zimlet target apps
      *
      * @since ZCS 5.0.3
      */
     @ZAttr(id=606)
     public static final String A_zimbraZimletTarget = "zimbraZimletTarget";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc: User
-     * properties for Zimlets
+     * User properties for Zimlets
      */
     @ZAttr(id=296)
     public static final String A_zimbraZimletUserProperties = "zimbraZimletUserProperties";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * maximum number of user properties for zimlet allowed on an account
      *
      * @since ZCS 8.7.0,9.0.0
@@ -18146,7 +18121,6 @@ public static TwoFactorAuthSecretEncoding fromString(String s) throws ServiceExc
     public static final String A_zimbraZimletUserPropertiesMaxNumEntries = "zimbraZimletUserPropertiesMaxNumEntries";
 
     /**
-     * Deprecated since: 23.9.0. Zimlets are not supported. Orig desc:
      * Version of the Zimlet
      */
     @ZAttr(id=282)

diff --git a/common/src/main/java/com/zimbra/common/localconfig/LC.java b/common/src/main/java/com/zimbra/common/localconfig/LC.java
@@ -399,6 +399,10 @@ public final class LC {
   public static final KnownKey ldap_cache_xmppcomponent_maxsize = KnownKey.newKey(100);
   public static final KnownKey ldap_cache_xmppcomponent_maxage = KnownKey.newKey(15);
 
+  @Supported public static final KnownKey ldap_cache_zimlet_maxsize = KnownKey.newKey(100);
+
+  @Supported public static final KnownKey ldap_cache_zimlet_maxage = KnownKey.newKey(15);
+
   public static final KnownKey ldap_cache_custom_dynamic_group_membership_maxage_ms =
       KnownKey.newKey(10 * Constants.MILLIS_PER_MINUTE);
 
@@ -550,6 +554,12 @@ public final class LC {
 
   public static final KnownKey ssl_default_digest = KnownKey.newKey("sha256");
 
+  @Supported
+  public static final KnownKey zimlet_directory =
+      KnownKey.newKey("${zimbra_home}/zimlets-deployed");
+
+  public static final KnownKey zimlet_deploy_timeout = KnownKey.newKey("10"); // seconds
+
   @Supported
   public static final KnownKey calendar_outlook_compatible_allday_events = KnownKey.newKey(false);
 

diff --git a/common/src/main/java/com/zimbra/common/soap/AccountConstants.java b/common/src/main/java/com/zimbra/common/soap/AccountConstants.java
@@ -48,8 +48,12 @@ private AccountConstants() {
   public static final String E_GET_WHITE_BLACK_LIST_RESPONSE = "GetWhiteBlackListResponse";
   public static final String E_MODIFY_PREFS_REQUEST = "ModifyPrefsRequest";
   public static final String E_MODIFY_PREFS_RESPONSE = "ModifyPrefsResponse";
+  public static final String E_MODIFY_PROPERTIES_REQUEST = "ModifyPropertiesRequest";
+  public static final String E_MODIFY_PROPERTIES_RESPONSE = "ModifyPropertiesResponse";
   public static final String E_MODIFY_WHITE_BLACK_LIST_REQUEST = "ModifyWhiteBlackListRequest";
   public static final String E_MODIFY_WHITE_BLACK_LIST_RESPONSE = "ModifyWhiteBlackListResponse";
+  public static final String E_MODIFY_ZIMLET_PREFS_REQUEST = "ModifyZimletPrefsRequest";
+  public static final String E_MODIFY_ZIMLET_PREFS_RESPONSE = "ModifyZimletPrefsResponse";
 
   // GAL
   public static final String E_AUTO_COMPLETE_GAL_REQUEST = "AutoCompleteGalRequest";
@@ -179,10 +183,18 @@ private AccountConstants() {
       QName.get(E_GET_WHITE_BLACK_LIST_RESPONSE, NAMESPACE);
   public static final QName MODIFY_PREFS_REQUEST = QName.get(E_MODIFY_PREFS_REQUEST, NAMESPACE);
   public static final QName MODIFY_PREFS_RESPONSE = QName.get(E_MODIFY_PREFS_RESPONSE, NAMESPACE);
+  public static final QName MODIFY_PROPERTIES_REQUEST =
+      QName.get(E_MODIFY_PROPERTIES_REQUEST, NAMESPACE);
+  public static final QName MODIFY_PROPERTIES_RESPONSE =
+      QName.get(E_MODIFY_PROPERTIES_RESPONSE, NAMESPACE);
   public static final QName MODIFY_WHITE_BLACK_LIST_REQUEST =
       QName.get(E_MODIFY_WHITE_BLACK_LIST_REQUEST, NAMESPACE);
   public static final QName MODIFY_WHITE_BLACK_LIST_RESPONSE =
       QName.get(E_MODIFY_WHITE_BLACK_LIST_RESPONSE, NAMESPACE);
+  public static final QName MODIFY_ZIMLET_PREFS_REQUEST =
+      QName.get(E_MODIFY_ZIMLET_PREFS_REQUEST, NAMESPACE);
+  public static final QName MODIFY_ZIMLET_PREFS_RESPONSE =
+      QName.get(E_MODIFY_ZIMLET_PREFS_RESPONSE, NAMESPACE);
 
   // GAL
   public static final QName AUTO_COMPLETE_GAL_REQUEST =
@@ -406,6 +418,10 @@ private AccountConstants() {
   public static final String A_OWNER_OF = "ownerOf";
   public static final String A_PERSIST_AUTH_TOKEN_COOKIE = "persistAuthTokenCookie";
   public static final String A_TOTAL = "total";
+  public static final String A_ZIMLET = "zimlet";
+  public static final String A_ZIMLET_BASE_URL = "baseUrl";
+  public static final String A_ZIMLET_PRIORITY = "priority";
+  public static final String A_ZIMLET_PRESENCE = "presence";
   public static final String A_TIMESTAMP = "timestamp";
   public static final String A_TOKENIZE_KEY = "tokenizeKey";
   public static final String A_EXPIRES = "expires";