Kecak workflow development

.gitignore

@@ -217,4 +217,9 @@ nbdist/
 ## Joget
 #################
 
-wflow-consoleweb/src/main/webapp/wro/
+wflow-consoleweb/src/main/webapp/wro/
+
+
+## NPM
+*/node_modules/
+*/package-lock.json

README.md

@@ -1,55 +1,3 @@
-# Joget
+# Kecak
 
-**Joget** is a next generation **open source no-code / low-code application platform** for faster, simpler digital transformation (DX).
-
-Joget combines the best of **rapid application development**, **business process automation** and **workflow management** in a simple, flexible and open platform. Business and technical teams can collaborate to rapidly build full-fledged enterprise applications visually, anywhere, anytime.
-
-- Web-based visual approach empowers non-coders to build and maintain apps anytime, anywhere
-- Reduces time to market, from months to weeks or days
-- Apps built are mobile ready, cloud ready
-- APIs for integration and plugin architecture for extensibility
-- "App Store" for enterprise apps – Joget Marketplace
-
-
-## Licensing
-
-- Joget Community Edition (CE) is licensed under the [GNU General Public License version 3](https://opensource.org/licenses/gpl-3.0).  
-- Joget Professional Edition (PE), Enterprise Edition (EE) and Large Enterprise Edition (LEE) are licensed under a [commercial EULA](https://www.joget.org/product/enterprise-eula).
-
-
-## Getting Started
-
-One of the key principles of the Joget platform is its flexibility. Many deployments options are available: 
-On-Premise, On-Demand Cloud, Docker, Kubernetes, Cloud Foundry, Certified OpenShift Operator, Red Hat Marketplace, Google Workspace Marketplace, AWS Marketplace, Azure Marketplace, Google Cloud Marketplace.
-
-- [Get Started with Joget](https://www.joget.org/get-started)
-
-
-## Resources
-
-- [Community Q&A](https://answers.joget.org) - Ask questions, get answers, and help others.
-- [Knowledge Base](https://community.joget.org) - User and developer reference, samples and other documentation.
-- [Video Tutorials](https://www.joget.org/tutorials) - Quick overview and build your first app.
-- [Joget Academy](https://academy.joget.org) - Self-paced online learning and certification.
-- [Joget Marketplace](https://marketplace.joget.org) - Download ready made apps, plugins, templates and more.
-- [Language Translations](https://translate.joget.org) - Translations for more than 20 languages.
-- [Events](https://www.joget.com/events) - Upcoming and past Joget events & webinars.
-- [Press](https://www.joget.com/press) - Joget press releases.
-- [Reviews](https://www.joget.com/reviews) - Joget reviews and customer testimonials.
-
-Follow us for the latest news and updates
-
-- [Twitter](https://www.twitter.com/jogetworkflow)
-- [LinkedIn](https://www.linkedin.com/company/joget)
-- [Facebook](https://www.facebook.com/jogetworkflow)
-- [YouTube](https://www.youtube.com/jogetworkflow)
-
-
-## Building from Source
-
-To build from source, please refer to [Build Source Code](https://dev.joget.org/community/display/DX7/Joget+Open+Source).
-
-
-## Contributing
-
-Joget is an open source project and if you would like to contribute, please refer to [How to Contribute](https://dev.joget.org/community/display/DX7/How-to+Contribute).
+Forked from Joget Community Edition

wflow-app/pom.xml

@@ -2,14 +2,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.joget</groupId>
     <artifactId>wflow-app</artifactId>
-    <version>7.0.36</version>
+    <version>7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>wflow-app</name>
-    <url>http://www.joget.org</url>
+    <url>http://kecak.org</url>
     <scm>
-        <connection>scm:git:ssh://git@repo.joget.org:2224/joget/jw-community.git</connection>
-        <developerConnection>scm:git:ssh://git@repo.joget.org:2224/joget/jw-community.git</developerConnection>
-        <url>ssh://git@repo.joget.org:2224/joget/jw-community.git</url>
+        <connection>scm:git:ssh://git@github.com:kinnara-digital-studio/kecak-workflow-v3.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com:kinnara-digital-studio/kecak-workflow-v3.git</developerConnection>
+        <url>ssh://git@github.com:kinnara-digital-studio/kecak-workflow-v3.git</url>
         <tag>7.0.36</tag>
     </scm>
     <modules>

wflow-commons/pom.xml

@@ -4,17 +4,17 @@
     <groupId>org.joget</groupId>
     <artifactId>wflow-commons</artifactId>
     <packaging>jar</packaging>
-    <version>7.0.36</version>
+    <version>7.0-SNAPSHOT</version>
     <name>wflow-commons</name>
-    <url>http://www.joget.org</url>
+    <url>http://kecak.org</url>
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
+                <version>3.6.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -265,7 +265,7 @@
         <dependency>
             <groupId>commons-dbcp</groupId>
             <artifactId>commons-dbcp</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -349,13 +349,35 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
             <version>4.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.atomikos</groupId>
+            <artifactId>transactions-jta</artifactId>
+            <version>3.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20080701</version>
+            <scope>compile</scope>
         </dependency>    
         <dependency>
             <groupId>com.drewnoakes</groupId>
             <artifactId>metadata-extractor</artifactId>
             <version>2.18.0</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.jasypt</groupId>
+            <artifactId>jasypt</artifactId>
+            <version>1.9.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <distributionManagement>
         <repository>

wflow-commons/src/main/java/org/joget/commons/spring/model/AbstractSpringDao.java

@@ -63,7 +63,7 @@ protected List findByExample(String entityName, Object object) {
 
     protected Collection find(final String entityName, final String condition, final Object[] params, final String sort, final Boolean desc, final Integer start, final Integer rows) {
         Session session = findSession();
-        String query = "SELECT e FROM " + entityName + " e " + condition;
+        String query = "SELECT e FROM " + entityName + " e " + (condition == null ? "" : condition);
 
         if (sort != null && !sort.equals("")) {
             String filteredSort = filterSpace(sort);
@@ -126,6 +126,11 @@ protected String filterSpace(String str) {
             }
         }
         return str;
-    }    
+    }
+
+    public List find(String entityName){
+        Session session = findSession();
+        return session.createQuery( "FROM " + entityName).list();
+    }
 }
 

wflow-commons/src/main/java/org/joget/commons/util/DynamicDataSource.java

@@ -5,54 +5,61 @@
 import java.util.Map;
 import java.util.Properties;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.dbcp.managed.BasicManagedDataSource;
 import org.apache.tomcat.jdbc.pool.XADataSource;
 
-public class DynamicDataSource extends XADataSource {
+import javax.sql.DataSource;
+
+public class DynamicDataSource extends BasicManagedDataSource {
 
     public static final String URL = "Url";
+
     public static final String USER = "User";
     public static final String PASSWORD = "Password";
     public static final String DRIVER = "Driver";
     private String datasourceName;
-    
+
     @Override
-    public Connection getConnection() throws SQLException {
+    protected synchronized DataSource createDataSource() throws SQLException {
+
         Properties properties = DynamicDataSourceManager.getProperties();
         String tempDriver = properties.getProperty(getDatasourceName() + DRIVER);
         String tempUrl = properties.getProperty(getDatasourceName() + URL);
         String tempUser = properties.getProperty(getDatasourceName() + USER);
         String tempPassword = properties.getProperty(getDatasourceName() + PASSWORD);
-
+        ;
         if (tempDriver == null || tempDriver.length() == 0 ||
                 tempUrl == null || tempUrl.length() == 0 ||
                 tempUser == null || tempUser.length() == 0) {
+
+            LogUtil.info(DynamicDataSource.class.getName(), "tempDriver [" + tempDriver + "] tempUrl [" + tempUrl + "] tempUser [" + tempUser + "]");
             throw new SQLException("No database profile configured");
         }
 
         if (tempPassword == null) {
             tempPassword = "";
         }
 
-        if (!getUrl().equals(tempUrl)) {
+        if (!this.url.equals(tempUrl)) {
             //close old datasource
             super.close();
+            super.closed = false;
 
             // set new settings
-            setDriverClassName(tempDriver);
-            setUrl(tempUrl);
-            setUsername(tempUser);
-            setPassword(tempPassword);
-            setProperties(properties);
-            LogUtil.info(getClass().getName(), "profileName=" + HostManager.getCurrentProfile() + ", url=" + getUrl() + ", user=" + getUsername());
+            this.driverClassName = tempDriver;
+            this.url = tempUrl;
+            this.username = tempUser;
+            this.password = tempPassword;
+            LogUtil.info(getClass().getName(), "datasourceName=" + getDatasourceName() + ", url=" + url + ", user=" + username);
         }
-        return super.getConnection();
+        return super.createDataSource();
     }
 
     protected void setProperties(Properties properties) {
         for (Map.Entry<Object, Object> e : properties.entrySet()) {
             String key = (String) e.getKey();
             String value = (String) e.getValue();
-            
+
             if (key.endsWith(DRIVER) || key.endsWith(URL) || key.endsWith(USER) || key.endsWith(PASSWORD) || key.endsWith("profileName") || key.endsWith("encryption")) {
                 continue;
             }

wflow-commons/src/main/java/org/joget/commons/util/DynamicDataSourceManager.java

@@ -352,7 +352,7 @@ protected static void createDefaultProfile() {
 
             writeProperty("workflowUser", "root");
             writeProperty("workflowPassword", "");
-            writeProperty("workflowDriver", "com.mysql.jdbc.Driver");
+            writeProperty("workflowDriver", "com.mysql.cj.jdbc.Driver");
             writeProperty("workflowUrl", "jdbc:mysql://localhost:3306/jwdb?characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true");
             writeProperty("profileName", "");
         } catch (Exception e) {

wflow-commons/src/main/java/org/joget/commons/util/SecurityUtil.java

@@ -4,6 +4,7 @@
 import java.net.URLDecoder;
 import java.text.Normalizer;
 import java.util.List;
+import java.util.Random;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import org.owasp.csrfguard.CsrfGuard;
@@ -338,4 +339,31 @@ public static String normalizedFileName(String filename) {
         }
         return normalizedFileName;
     }
+
+    /**
+     * @param targetStringLength expected result characters length
+     * @param lower              includes lower case characters
+     * @param upper              includes upper case characters
+     * @param numeric            includes numeric characters
+     * @param space              includes space character
+     * @param special            includes special characters
+     * @return
+     */
+    public static String generateRandomString(int targetStringLength, boolean lower, boolean upper, boolean numeric, boolean space, boolean special) {
+        int leftLimit = 32; // letter <space>
+        int rightLimit = 126; // letter '~'
+        Random random = new Random();
+
+        String generatedString = random.ints(leftLimit, rightLimit + 1)
+                .filter(i -> (lower && 97 <= i && i <= 122)
+                        || (upper && 65 <= i && i <= 90)
+                        || (numeric && 48 <= i && i <= 57)
+                        || (space && i == 32)
+                        || (special && (33 <= i && i <= 47 || 58 <= i && i <= 64 || 91 <= i && i <= 96 || 123 <= i && i <= 126)))
+                .limit(targetStringLength)
+                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                .toString();
+
+        return generatedString;
+    }
 }

wflow-commons/src/main/java/org/joget/commons/util/SetupDao.java

@@ -18,7 +18,7 @@ public void delete(Object obj) {
         super.delete(ENTITY_NAME, obj);
     }
 
-    public Object find(String id) {
+    public Object load(String id) {
         return super.find(ENTITY_NAME, id);
     }
 

wflow-commons/src/main/java/org/joget/commons/util/SetupManager.java

@@ -17,7 +17,11 @@ public class SetupManager {
     public static final String SYSTEM_PROPERTY_WFLOW_HOME = "wflow.home";
     public static final String SYSTEM_PROPERTY_WFLOW_SECURE = "wflow.secure";
     public static final String DIRECTORY_PROFILES = "app_profiles";
+    public static final String MASTER_LOGIN_USERNAME = "masterLoginUsername";
     public static final String MASTER_LOGIN_PASSWORD = "masterLoginPassword";
+    public final static String PROPERTY_SETUP_SECURITY_SALT = "securitySalt";
+    public final static String PROPERTY_SETUP_SECURITY_KEY = "securityKey";
+
     public static final String SMTP_PASSWORD = "smtpPassword";
     public static final String SECURE_VALUE = "****SECURE VALUE*****";