Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat

config/micord.env

@@ -5,3 +5,27 @@ DB_APP_PASSWORD=ervu-lkrp-fl
 DB_APP_HOST=10.10.31.119
 DB_APP_PORT=5432
 DB_APP_NAME=ervu-lkrp-fl
+
+ESIA_SCOPES=snils, fullname, birthdate, id_doc
+ESIA_BASE_URI=https://esia-portal1.test.gosuslugi.ru/
+ESIA_CLIENT_ID=MNSV89
+ESIA_REDIRECT_URL=https://lkrp-dev.micord.ru/fl/
+SIGN_URL=https://ervu-sign-dev.k8s.micord.ru/sign
+ESIA_CLIENT_CERT_HASH=04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD
+ERVU_KAFKA_BOOTSTRAP_SERVERS=localhost:9092
+ERVU_KAFKA_REPLY_TOPIC=ervu.lkpr.person.search.response
+ERVU_KAFKA_GROUP_ID=1
+ERVU_KAFKA_REQUEST_TOPIC=ervu.lkpr.person.search.request
+ERVU_KAFKA_REPLY_TIMEOUT=30
+ERVU_KAFKA_SEND_SECURITY_PROTOCOL=SASL_PLAINTEXT
+ERVU_KAFKA_SASL_MECHANISM=SCRAM-SHA-256
+ERVU_KAFKA_SEND_USERNAME=user1
+ERVU_KAFKA_SEND_PASSWORD=Blfi9d2OFG
+ERVU_KAFKA_RECRUIT_REQUEST_TOPIC=ervu.recruit.info.request
+ERVU_KAFKA_RECRUIT_REPLY_TOPIC=ervu.recruit.info.response
+ERVU_KAFKA_RECRUIT_HEADER_CLASS=Request@urn://rostelekom.ru/RP-SummonsTR/1.0.5
+ERVU_KAFKA_SUBPOENA_EXTRACT_REQUEST_TOPIC=ervu.subpoena.info.request
+ERVU_KAFKA_SUBPOENA_EXTRACT_REPLY_TOPIC=ervu.subpoena.info.response
+ERVU_KAFKA_REGISTRY_EXTRACT_REQUEST_TOPIC=ervu.extract.info.request
+ERVU_KAFKA_REGISTRY_EXTRACT_REPLY_TOPIC=ervu.extract.info.response
+ERVU_KAFKA_EXTRACT_HEADER_CLASS=Request@urn://rostelekom.ru/ERVU-extractFromRegistryTR/1.0.3

config/standalone/dev/standalone.xml

@@ -54,6 +54,32 @@
         <property name="security.password.regex" value="^((?=(.*\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$"/>
         <property name="fias.enable" value="false"/>
         <property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
+        <property name="esia.scopes" value="snils, fullname, birthdate, id_doc"/>
+        <property name="esia.base.uri" value="https://esia-portal1.test.gosuslugi.ru/"/>
+        <property name="esia.client.id" value="MNSV89"/>
+        <property name="esia.redirect.url" value="https://lkrp.micord.ru"/>
+        <property name="sign.url" value="https://ervu-sign-dev.k8s.micord.ru/sign"/>
+        <property name="esia.client.cert.hash" value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD"/>
+        <property name="bpmn.enable" value="false"/>
+        <property name="ervu.kafka.bootstrap.servers" value="localhost:9092"/>
+        <property name="ervu.kafka.reply.topic" value="ervu.lkpr.person.search.response"/>
+        <property name="ervu.kafka.group.id" value="1"/>
+        <property name="ervu.kafka.request.topic" value="ervu.lkpr.person.search.request"/>
+        <property name="ervu.kafka.reply.timeout" value="30"/>
+        <property name="bpmn.enable" value="false"/>
+        <property name="ervu.kafka.security.protocol" value="SASL_PLAINTEXT"/>
+        <property name="ervu.kafka.doc.login.module" value="org.apache.kafka.common.security.scram.ScramLoginModule"/>
+        <property name="ervu.kafka.sasl.mechanism" value="SCRAM-SHA-256"/>
+        <property name="ervu.kafka.username" value="user1"/>
+        <property name="ervu.kafka.password" value="Blfi9d2OFG"/>
+        <property name="ervu.kafka.recruit.request.topic" value="ervu.recruit.info.request"/>
+        <property name="ervu.kafka.recruit.reply.topic" value="ervu.recruit.info.response"/>
+        <property name="ervu.kafka.recruit.header.class" value="Request@urn://rostelekom.ru/RP-SummonsTR/1.0.5"/>
+        <property name="ervu.kafka.subpoena.extract.request.topic" value="ervu.subpoena.info.request"/>
+        <property name="ervu.kafka.subpoena.extract.reply.topic" value="ervu.subpoena.info.response"/>
+        <property name="ervu.kafka.registry.extract.request.topic" value="ervu.extract.info.request"/>
+        <property name="ervu.kafka.registry.extract.reply.topic" value="ervu.extract.info.response"/>
+        <property name="ervu.kafka.extract.header.class" value="request@urn://rostelekom.ru/ERVU-extractFromRegistryTR/1.0.3"/>
     </system-properties>
     <management>
         <audit-log>
@@ -557,4 +583,4 @@
             <remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
         </outbound-socket-binding>
     </socket-binding-group>
-</server>
+</server>

config/tomcat/tomee/bin/setenv.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+export JAVA_OPTS="$JAVA_OPTS \
+ -Ddb.app.host=${DB_APP_HOST:-db} \
+ -Ddb.app.port=${DB_APP_PORT:-5432} \
+ -Ddb.app.name=${DB_APP_NAME:-app} \
+ -Ddb.app.username=${DB_APP_USERNAME:-app_user} \
+ -Ddb.app.password=${DB_APP_PASSWORD:-apppassword} \
+"

config/tomcat/tomee/conf/context.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context>
+
+    <!-- Default set of monitored resources. If one of these changes, the    -->
+    <!-- web application will be reloaded.                                   -->
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+    <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
+    <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+
+    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+    <!--
+    <Manager pathname="" />
+    -->
+
+    <Resource name="java:/webbpm/AppDS" auth="Container"
+          type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
+          url="jdbc:postgresql://${db.app.host}:${db.app.port}/${db.app.name}"
+          username="${db.app.username}" password="${db.app.password}" maxTotal="20" maxIdle="10" maxWaitMillis="-1"/>
+</Context>

config/tomcat/tomee/conf/tomcat-users.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<tomcat-users xmlns="http://tomcat.apache.org/xml"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
+              version="1.0">
+<!--
+  By default, no user is included in the "manager-gui" role required
+  to operate the "/manager/html" web application.  If you wish to use this app,
+  you must define such a user - the username and password are arbitrary.
+
+  Built-in Tomcat manager roles:
+    - manager-gui    - allows access to the HTML GUI and the status pages
+    - manager-script - allows access to the HTTP API and the status pages
+    - manager-jmx    - allows access to the JMX proxy and the status pages
+    - manager-status - allows access to the status pages only
+
+  The users below are wrapped in a comment and are therefore ignored. If you
+  wish to configure one or more of these users for use with the manager web
+  application, do not forget to remove the <!.. ..> that surrounds them. You
+  will also need to set the passwords to something appropriate.
+-->
+  <user username="admin" password="<must-be-changed>" roles="manager-gui"/>
+</tomcat-users>

config/tomcat/tomee/conf/webbpm.properties

@@ -0,0 +1,15 @@
+# WebBPM properties
+
+authentication.method=form
+
+bpmn.enable=false
+fias.enable=false
+gar.enable=false
+
+reset_password.mail.template.path=mail/reset_password.html
+security.password.regex=^(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]+$
+
+webbpm.mode=production
+webbpm.jbpm.hibernate_statistics.enabled=false
+webbpm.cache.hazelcast.hosts=127.0.0.1
+webbpm.cache.hazelcast.outbound_port_definitions=5801-5820

config/tomcat/tomee/webapps/manager/META-INF/context.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<Context antiResourceLocking="false" privileged="true" >
+  <CookieProcessor className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
+                   sameSiteCookies="strict" />
+<!--
+  <Valve className="org.apache.catalina.valves.RemoteAddrValve"
+         allow="d+\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" />
+-->
+  <Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
+</Context>