B/google api

.github/workflows/rust.yml

@@ -20,6 +20,8 @@ env:
   SMTP_USERNAME: ${{ vars.SMTP_USERNAME }}
   SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
   ADMIN_EMAIL: ${{ vars.ADMIN_EMAIL }}
+  GOOGLE_CLIENT_JSON_BASE64: ${{ secrets.GOOGLE_CLIENT_JSON_BASE64 }}
+  GOOGLE_PROJECT_ID: ${{ vars.GOOGLE_PROJECT_ID }}
 
 
 jobs:
@@ -103,6 +105,11 @@ jobs:
       run: |
         cargo install sqlx-cli --no-default-features --features native-tls,postgres
         cargo sqlx database setup
+    - name: Prepare secret file
+      run: |
+        echo "$GOOGLE_CLIENT_JSON_BASE64" >> secret.base64
+        base64 --decode secret.base64 > secret.json
+        echo "SERVICE_ACCOUNT_JSON=$(realpath secret.json)" >> $GITHUB_ENV
     - name: Run tests
       run: cargo test --verbose
 
@@ -135,6 +142,11 @@ jobs:
         run: |
           cargo install sqlx-cli --no-default-features --features native-tls,postgres
           cargo sqlx database setup
+      - name: Prepare secret file
+        run: |
+          echo "$GOOGLE_CLIENT_JSON_BASE64" >> secret.base64
+          base64 --decode secret.base64 > secret.json
+          echo "SERVICE_ACCOUNT_JSON=$(realpath secret.json)" >> $GITHUB_ENV
       - name:                   Generate code coverage
         run: |
           cargo tarpaulin --all-targets --skip-clean --workspace --timeout 120 --out xml

backend/.env.example

@@ -1,5 +1,5 @@
 # copy this file to .env and set your own values
-# optional environment variabls (when default values are available) are commented out
+# optional environment variables (when default values are available) are commented out
 
 # --- connection to database ---
 DATABASE_URL=postgres://postgres_user@localhost/mensa_app
@@ -15,6 +15,13 @@ ADMIN_EMAIL=
 #FULL_PARSE_SCHEDULE=
 #UPDATE_PARSE_SCHEDULE=
 
+# --- google api ---
+SERVICE_ACCOUNT_JSON=path_to_json
+GOOGLE_PROJECT_ID=PROJECT_ID
+# Order:    adult,spoof,medical,violence,racy
+# Mapping:  0=Unknown,1=VeryUnlikely,2=Unlikely,3=Possible,4=Likely,5=VeryLikely
+IMAGE_ACCEPTANCE_VALUES=0,0,0,0,0
+
 # --- mensa parser ---
 #CLIENT_TIMEOUT=
 #MENSA_BASE_URL=https://www.sw-ka.de/de/hochschulgastronomie/speiseplan/

backend/.gitignore

@@ -15,4 +15,7 @@ target/
 
 # test coverage
 lcov.info
-*.profraw
+*.profraw
+
+# private test data
+src/layer/data/image_validation/test/test-client.json

backend/Cargo.toml

@@ -54,6 +54,8 @@ lazy_static = "1.4.0"
 colored = "2.0.4"
 image = "0.24.0"
 tower-http = { version = "0.4.4", features = ["fs"] }
+serde = "1.0.188"
+google-jwt-auth = "0.0.2"
 hyper = { version = "0.14" }
 mime = "0.3.17"
 hmac = "0.12.1"

backend/README.md

@@ -39,6 +39,7 @@ Alternatively, you can also just build yourself and run the binary. See [below](
 ### Environment variables
 To pass configuration options to the backend application environment variables are used.
 The following options are available:
+
 | Name                                     | Description                                                                                                                                                                                                                                                                                   | Default / Required                                                                                                           |
 | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
 | `LOG_CONFIG`                             | Configure which messages are logged. For more information on the used syntax, see [here](https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives). You may want to set this to `warn,mensa_app_backend=trace` to enable all messages we produce. | `warn,mensa_app_backend=info`                                                                                                |
@@ -50,6 +51,9 @@ The following options are available:
 | `SMTP_PASSWORD`                          | Password to access the SMTP server.                                                                                                                                                                                                                                                           | required                                                                                                                     |
 | `FULL_PARSE_SCHEDULE`                    | [Cron](https://cron.help/)-**like** schedule for when to run a full parsing to get the meal plans for the next three weeks. **A sixth, first _digit_ specifying the seconds is necessary!**                                                                                                   | `0 0 2 * * *`                                                                                                                |
 | `UPDATE_PARSE_SCHEDULE`                  | Schedule for when to update the mealplan for the current day. Same format as `FULL_PARSE_SCHEDULE`                                                                                                                                                                                            | `0 */15 10-15 * * *`                                                                                                         |
+| `SERVICE_ACCOUNT_JSON`                   | Path to the service account json that can be downloaded during the key generation for the service account in the google console.                                                                                                                                                              | required                                                                                                                     |
+| `GOOGLE_PROJECT_ID`                      | The `project_id` can be copied from the google (console). It should be the same project from which the account comes.                                                                                                                                                                         | required                                                                                                                     |
+| `IMAGE_ACCEPTANCE_VALUES`                | Comma separated list of five integers from 0 to 5. These values determine which images will be accepted and which not. More info about levels and categories are in the documentation.                                                                                                                                                           | `1,1,1,1,1`                                                                                                                  |
 | `CLIENT_TIMEOUT`                         | Timeout in ms for requesting the webpage containing the meal plan.                                                                                                                                                                                                                            | `6000`                                                                                                                       |
 | `MENSA_BASE_URL`                         | Base URL where meal plans are requested. It excludes the canteens name, which will be appended later on.                                                                                                                                                                                      | `https://www.sw-ka.de/de/hochschulgastronomie/speiseplan/`                                                                   |
 | `CANTEENS`                               | Comma (`,`) separated list of canteens which should be requested and parsed. These are appended on the `MENSA_BASE_URL`.                                                                                                                                                                      | `mensa_adenauerring,mensa_gottesaue,mensa_moltke,mensa_x1moltkestrasse,mensa_erzberger,mensa_tiefenbronner,mensa_holzgarten` |
@@ -60,6 +64,7 @@ The following options are available:
 | `IMAGE_DIR`                              | Path to folder where images will be stored. Backslashes (`\`) need to be escaped (`\\`).                                                                                                                                                                                                      | required                                                                                                                     |
 | `MAX_IMAGE_WIDTH` and `MAX_IMAGE_HEIGHT` | Maximum width and height stored for stored images. Uploaded images will be scaled accordingly.                                                                                                                                                                                                | `1920` and `1080`                                                                                                            |
 
+
 ## Building the backend
 
 ### Run the backend

backend/src/interface/api_command.rs

@@ -69,5 +69,5 @@ pub enum CommandError {
     ImageStorageError(#[from] image_storage::ImageError),
     /// Error while image verification.
     #[error("Image could not be verified: {0}")]
-    ImageValidationError(#[from] image_validation::ImageError),
+    ImageValidationError(#[from] image_validation::ImageValidationError),
 }