Merge branch 'development'

Author: KharchenkoMaks

Dockerfile

@@ -23,6 +23,7 @@ ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
 ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
 ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
 ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
+ARG WPR_VEX_DIR=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/vex
 ARG WPR_USER_ID=2000
 ARG WPR_GROUP_ID=2000
 ARG WPR_USER_NAME=wsc
@@ -100,6 +101,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget
 ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
 ARG WPR_DEPLOYMENT_DIR=/home
 ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
+ARG WPR_VEX_FILE_URL=https://files.webspellchecker.com/security/vex/opennlp-cves-v2.0.0.vex.json
 
 # Comma-separated list of language IDs to install
 ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
@@ -122,7 +124,9 @@ ENV WPR_AUTO_INSTALL=TRUE
 RUN mkdir -p $WPR_CUSTOM_DICTIONARIES_DIR \
              $WPR_USER_DICTIONARIES_DIR \
              $WPR_WSC_SERVICE_FILES_PATH \
-             /var/run/nginx
+             $WPR_VEX_DIR \
+             /var/run/nginx && \
+    wget -O $WPR_VEX_DIR/opennlp-cves.vex.json $WPR_VEX_FILE_URL
 
 COPY $WPR_FILES_DIR/$WPR_APP_NAME_MASK $WPR_DEPLOYMENT_DIR/
 RUN PACKAGE_FILE=$(ls -1t $WPR_DEPLOYMENT_DIR/$WPR_APP_NAME_MASK 2>/dev/null | head -n 1) && \
@@ -160,6 +164,7 @@ RUN mkdir -p /var/run/nginx && chown -R ${WPR_FILE_OWNER} /var/run/nginx
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_APP_INSTALL_DIR $WPR_APP_INSTALL_DIR
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_WSC_SERVICE_FILES_PATH
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_DICTIONARIES_DIR $WPR_DICTIONARIES_DIR
+COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_VEX_DIR $WPR_VEX_DIR
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
 

Dockerfile.redhat

@@ -30,6 +30,7 @@ ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
 ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
 ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
 ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
+ARG WPR_VEX_DIR=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/vex
 ARG WPR_USER_ID=2000
 ARG WPR_GROUP_ID=2000
 ARG WPR_USER_NAME=wsc
@@ -108,6 +109,7 @@ RUN yum update -y --skip-broken && \
 ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
 ARG WPR_DEPLOYMENT_DIR=/home
 ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
+ARG WPR_VEX_FILE_URL=https://files.webspellchecker.com/security/vex/opennlp-cves-v2.0.0.vex.json
 
 # Comma-separated list of language IDs to install
 ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
@@ -130,7 +132,9 @@ ENV WPR_AUTO_INSTALL=TRUE
 RUN mkdir -p $WPR_CUSTOM_DICTIONARIES_DIR \
              $WPR_USER_DICTIONARIES_DIR \
              $WPR_WSC_SERVICE_FILES_PATH \
-             /var/run/nginx
+             $WPR_VEX_DIR \
+             /var/run/nginx && \
+    wget -O $WPR_VEX_DIR/opennlp-cves.vex.json $WPR_VEX_FILE_URL
 
 COPY $WPR_FILES_DIR/$WPR_APP_NAME_MASK $WPR_DEPLOYMENT_DIR/
 RUN PACKAGE_FILE=$(ls -1t $WPR_DEPLOYMENT_DIR/$WPR_APP_NAME_MASK 2>/dev/null | head -n 1) && \
@@ -166,6 +170,7 @@ RUN mkdir -p /var/run/nginx && chown -R ${WPR_FILE_OWNER} /var/run/nginx
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_APP_INSTALL_DIR $WPR_APP_INSTALL_DIR
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_WSC_SERVICE_FILES_PATH
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_DICTIONARIES_DIR $WPR_DICTIONARIES_DIR
+COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_VEX_DIR $WPR_VEX_DIR
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
 COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
 

Dockerfile.ubuntu-prebuilt

@@ -93,6 +93,7 @@ ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
 ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
 ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
 ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
+ARG WPR_VEX_DIR=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/vex
 
 ENV WPR_APP_SERVER_DIR=${WPR_APP_SERVER_DIR}
 
@@ -159,6 +160,7 @@ RUN groupadd --gid ${WPR_GROUP_ID} $WPR_USER_NAME && useradd --no-log-init --uid
 
 COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /opt/WebSpellChecker ${WPR_APP_INSTALL_DIR}
 COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /var/lib/WebSpellChecker ${WPR_WSC_SERVICE_FILES_PATH}
+COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} ${WPR_VEX_DIR} ${WPR_VEX_DIR}
 COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
 COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /dictionaries ${WPR_DICTIONARIES_DIR}

files/configureFiles.pl

@@ -56,8 +56,8 @@ sub configureUserAndCustomDictionaries
 		system("mv $serverPath/CustDictConfig.xml $cust_dict_conf");
 	}
 
-	replaceFileContent({ '<StyleGuideCheck Enabled="(true|false)">[\s]*?<DirectoryPath>[\w\\\/:]*?<\/DirectoryPath>[\s]*?<\/StyleGuideCheck>' =>
-		"<StyleGuideCheck Enabled=\"true\">\n\t\t<DirectoryPath>$style_guide_path</DirectoryPath>\n\t</StyleGuideCheck>" }, $server_config_path);
+	replaceFileContent({ '<StyleGuideCheck Enabled="(true|false)">[\s]*?<DirectoryPath>[\w\\\/:]*?<\/DirectoryPath>' =>
+		"<StyleGuideCheck Enabled=\"true\">\n\t\t<DirectoryPath>$style_guide_path</DirectoryPath>" }, $server_config_path);
 
 	for my $file (<$serverPath/CustomDictionaries/*.txt>)
 	{