Ms logging

Dockerfile-auth

@@ -0,0 +1,15 @@
+from openjdk:16
+ARG MYSQL_PASSWORD
+
+WORKDIR /usr/app
+COPY ms/mysql-connector-java-5.1.45-bin.jar lib/
+ENV CLASSPATH=.:lib/mysql-connector-java-5.1.45-bin.jar:${CLASSPATH}
+
+COPY ms/Configuration-tmplt.java ./
+RUN sed "s/<PASSWORD>/${MYSQL_PASSWORD}/g" < Configuration-tmplt.java > Configuration.java
+RUN rm Configuration-tmplt.java
+
+COPY ms/AuthServices.java ms/AuthServicesAI.java ms/LoggingServicesAI.java ./
+RUN javac *.java
+
+CMD java AuthServices

Dockerfile-cs

@@ -9,7 +9,7 @@ COPY ms/Configuration-tmplt.java ./
 RUN sed "s/<PASSWORD>/${MYSQL_PASSWORD}/g" < Configuration-tmplt.java > Configuration.java
 RUN rm Configuration-tmplt.java
 
-COPY ms/CreateServices.java ms/CreateServicesAI.java ./
+COPY ms/LoggingServicesAI.java ms/CreateServices.java ms/CreateServicesAI.java ms/AuthServicesAI.java  ./
 RUN javac *.java
 
 CMD java CreateServices

Dockerfile-ds

@@ -0,0 +1,18 @@
+FROM openjdk:16
+ARG MYSQL_PASSWORD
+
+WORKDIR /usr/app
+
+COPY ms/mysql-connector-java-5.1.45-bin.jar lib/
+ENV CLASSPATH=.:lib/mysql-connector-java-5.1.45-bin.jar:${CLASSPATH}
+
+COPY ms/Configuration-tmplt.java ./
+RUN sed "s/<PASSWORD>/${MYSQL_PASSWORD}/g" < Configuration-tmplt.java > Configuration.java
+RUN rm Configuration-tmplt.java
+
+
+COPY ms/LoggingServicesAI.java ms/DeleteServices.java ms/DeleteServicesAI.java ms/AuthServicesAI.java ./
+
+RUN javac *.java
+
+CMD java DeleteServices

Dockerfile-logging

@@ -0,0 +1,15 @@
+from openjdk:16
+# ARG MYSQL_PASSWORD
+
+WORKDIR /usr/app
+COPY ms/mysql-connector-java-5.1.45-bin.jar lib/
+ENV CLASSPATH=.:lib/mysql-connector-java-5.1.45-bin.jar:${CLASSPATH}
+
+COPY ms/Configuration-tmplt.java ./
+RUN sed "s/<PASSWORD>/${MYSQL_PASSWORD}/g" < Configuration-tmplt.java > Configuration.java
+RUN rm Configuration-tmplt.java
+
+COPY ms/AsyncHandler.java ms/LoggingServices.java ms/LoggingServicesAI.java ./
+RUN javac *.java
+
+CMD java LoggingServices

Dockerfile-msc

@@ -5,7 +5,7 @@ WORKDIR /usr/app
 COPY ms/Configuration-tmplt.java ./
 RUN sed "s/<PASSWORD>//g" < Configuration-tmplt.java > Configuration.java
 RUN rm Configuration-tmplt.java
-COPY ms/registry.properties ms/OrdersUI.java ms/MSClientAPI.java ms/CreateServicesAI.java ms/RetrieveServicesAI.java ./
+COPY ms/registry.properties ms/OrdersUI.java ms/MSClientAPI.java ms/CreateServicesAI.java ms/RetrieveServicesAI.java ms/DeleteServicesAI.java ms/AuthServicesAI.java ./
 RUN javac *.java
 
 CMD java OrdersUI

Dockerfile-rs

@@ -1,3 +1,4 @@
+
 from openjdk:16
 ARG MYSQL_PASSWORD
 
@@ -9,7 +10,9 @@ COPY ms/Configuration-tmplt.java ./
 RUN sed "s/<PASSWORD>/${MYSQL_PASSWORD}/g" < Configuration-tmplt.java > Configuration.java
 RUN rm Configuration-tmplt.java
 
-COPY  ms/RetrieveServices.java ms/RetrieveServicesAI.java ./
+
+COPY  ms/LoggingServicesAI.java ms/RetrieveServices.java ms/RetrieveServicesAI.java ms/AuthServicesAI.java ./
+
 RUN javac *.java
 
 CMD java RetrieveServices

Dockerfile-ws

@@ -8,6 +8,9 @@ RUN npm -y init
 
 COPY ws/REST.js ws/
 COPY ws/Server.js ws/
+COPY ws/eventBus.js ws/
+COPY ws/logger.js ws/
+COPY ws/auth.js ws/
 COPY ws/config ws/config
 WORKDIR /usr/app/ws
 RUN sed "s/<PASSWORD>/${MYSQL_PASSWORD}/g" > config/mysql.config.json < config/mysql.config.json-tmplt

INSTALL.md

@@ -44,6 +44,7 @@ easy to navigate to on the command line. It’s a good idea to give it a nice sh
 - `Dockerfile-wsc` – file: Docker build instructions for the web-services client
 - `Dockerfile-cs` –  file: Docker build instructions for the microservices service: CreateServices
 - `Dockerfile-rs` –  file: Docker build instructions for the microservices service: RetrieveServices
+- `Dockerfile-ds` –  file: Docker build instructions for the microservices service: DeleteServices
 - `Dockerfile-msc` –  file: Docker build instructions for the microservices service
 - `stack-ws.yml`, `stack-ws-mx.yml` – file: Docker compose for building and running the web-services server and database stack. (`-mx` for Apple Silicon Macs.)
 - `stack-ms.yml`, `stack-ms-mx.yml` –  file: Docker compose file for building and running the microservices server and database stack. (`-mx` for Apple Silicon Macs.)
@@ -235,7 +236,11 @@ This will download the necessary base containers and build the microservices con
 ...
  ✔ Service client    Built                                                                                                                                                         1.5s 
  ✔ Service retrieve  Built                                                                                                                                                         1.5s 
- ✔ Service create    Built  
+ ✔ Service create    
+ Built                        
+                              1.5s
+ ✔ Service delete  Built                                                                                                                                                         1.5s 
+
 ```
 Or
 ```
@@ -254,12 +259,16 @@ The first time you do this (or have removed the contents of the ms-db folder). T
 ```
 ms_client   | 2: Retrieve an order by ID.
 ms_client   | 3: Add a new order to the order database.
+ms_client   | 4: Delete an order by ID.
 ms_client   | X: Exit
 ms_client   |
 ...
 ms_create   | Registered services:
 ms_create   |   CreateServices
 ...
+ms_create   | Registered services:
+ms_create   |   DeleteServices
+...
 ms_retrieve | Registered services:
 ms_mysql    | Version: '5.7.33'  socket: '/var/run/mysq...
 ```

README.md

@@ -3,3 +3,13 @@ This project contains the source code for the architecturally-compliant coding a
 The assignment instructions are given elsewhere.
 
 The installation instructions are available in [INSTALL.md](INSTALL.md).
+
+After installation the system can be accesed by a set of two user credentials:
+
+| User ID | Password       |
+|---------|----------------|
+| user1   | ChaosMonkey@24 |
+| user2   | OpenWebMath@77 |
+
+The user who interacts with the system will first have to log into the system by entering these credentials when prompted on the screen, to access any of the other APIs.
+

init-db/dbtemplate.sql

@@ -20,8 +20,23 @@
 --
 
 DROP TABLE IF EXISTS `orders`;
+DROP TABLE IF EXISTS `users`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+  `user_id` VARCHAR(10) NOT NULL,
+  `password` VARCHAR(100) DEFAULT NULL,
+  `token` VARCHAR(100) DEFAULT NULL,
+  PRIMARY KEY (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- Insert users into the `users` table
+INSERT INTO `users` (`user_id`, `password`) VALUES 
+('user1', 'ChaosMonkey@24'),
+('user2', 'OpenWebMath@77'),
+('Hari', 'badpassword'),
+('Kshitiz', 'betterpassword');
+
 CREATE TABLE `orders` (
   `order_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `order_date` date DEFAULT NULL,

stack-ms-mx.yml → ms.yml

@@ -9,6 +9,8 @@ services:
         MYSQL_PASSWORD: foo
     depends_on:
       - mysql
+      - auth
+      - logging
     environment:
       RMI_REMOTE_HOST: ms_create
       RMI_REMOTE_PORT: 1099
@@ -27,6 +29,8 @@ services:
         MYSQL_PASSWORD: foo
     depends_on:
       - mysql
+      - auth
+      - logging
     environment:
       RMI_REMOTE_HOST: ms_retrieve
       RMI_REMOTE_PORT: 1098
@@ -35,6 +39,26 @@ services:
     networks:
       - ms
 
+  delete:
+    image: ms_delete
+    container_name: ms_delete
+    build:
+      context: .
+      dockerfile: Dockerfile-ds
+      args:
+        MYSQL_PASSWORD: foo
+    depends_on:
+      - mysql
+      - auth
+      - logging
+    environment:
+      RMI_REMOTE_HOST: ms_delete
+      RMI_REMOTE_PORT: 1096
+      MYSQL_REMOTE_HOST: ms_mysql
+      MYSQL_REMOTE_PORT: 3306
+    networks:
+      - ms
+
   client:
     image: ms_client
     container_name: ms_client
@@ -43,13 +67,46 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-msc
+    depends_on:
+      - auth
     command: java OrdersUI
     environment:
       RMI_REMOTE_HOST: ms_server
       RMI_REMOTE_PORT: 1099
     networks:
       - ms
 
+  auth:
+      image: ms_auth
+      container_name: ms_auth
+      build:
+        context: .
+        dockerfile: Dockerfile-auth
+        args:
+          MYSQL_PASSWORD: foo
+      depends_on:
+        - mysql
+        - logging
+      environment:
+        RMI_REMOTE_HOST: ms_auth
+        RMI_REMOTE_PORT: 1097
+        MYSQL_REMOTE_HOST: ms_mysql
+        MYSQL_REMOTE_PORT: 3306
+      networks:
+        - ms
+
+  logging:
+      image: ms_logging
+      container_name: ms_logging
+      build:
+        context: .
+        dockerfile: Dockerfile-logging
+      environment:
+        RMI_REMOTE_HOST: ms_logging
+        RMI_REMOTE_PORT: 1100
+      networks:
+        - ms
+
   mysql:
     image: mysql:5
     platform: linux/amd64

ms/AsyncHandler.java

@@ -0,0 +1,58 @@
+import java.io.IOException;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+
+public class AsyncHandler extends Handler {
+    private final Handler delegate;
+    private final BlockingQueue<LogRecord> queue;
+    private final Thread worker;
+    private volatile boolean running = true;
+
+    public AsyncHandler(Handler delegate) {
+        this.delegate = delegate;
+        this.queue = new LinkedBlockingQueue<>();
+
+        this.worker = new Thread(() -> {
+            while (running || !queue.isEmpty()) {
+                try {
+                    LogRecord record = queue.poll(100, TimeUnit.MILLISECONDS);
+                    if (record != null) {
+                        delegate.publish(record);
+                    }
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    break;
+                } catch (Exception ex) {
+                    System.err.println("AsyncHandler error: " + ex.getMessage());
+                }
+            }
+        });
+        worker.setDaemon(true);
+        worker.start();
+    }
+
+    @Override
+    public void publish(LogRecord record) {
+        if (!isLoggable(record)) return;
+        queue.offer(record);
+    }
+
+    @Override
+    public void flush() {
+        delegate.flush();
+    }
+
+    @Override
+    public void close() throws SecurityException {
+        running = false;
+        try {
+            worker.join();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        delegate.close();
+    }
+}