11 Commits
0.5.0 ... main

Author SHA1 Message Date
8e0ec494cb redis
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 23:10:39 +01:00
9d42a46b43 redis
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 23:05:38 +01:00
95fa775c61 redis
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 23:03:35 +01:00
f8b54f7bba redis
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 23:01:14 +01:00
9d6555af82 disable oidc
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 14:34:05 +01:00
3d6c071233 disable oidc
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 14:27:56 +01:00
6ede84955c disable oidc
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 14:25:52 +01:00
b9b7c6b48d disable oidc
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 14:19:04 +01:00
d1280eea7b disable oidc
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 14:10:03 +01:00
c403e4f253 disable oidc
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 14:06:47 +01:00
d3e624b9ce new base image
All checks were successful
ci/woodpecker/manual/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-01-17 13:31:15 +01:00
3 changed files with 25 additions and 13 deletions

View File

@ -1,4 +1,4 @@
FROM python:3.12-alpine3.19
FROM python:3.12-alpine3.21
ARG APP_DIR="/opt/app"
ARG VERSION_ID1="x"

View File

@ -1,4 +1,6 @@
from flask import Flask, request, render_template, jsonify, redirect, url_for, g
from flask_session import Session
import redis
import sqlite3
from flask_oidc import OpenIDConnect
from werkzeug.middleware.proxy_fix import ProxyFix
@ -11,15 +13,21 @@ from math import ceil, floor
app = Flask(__name__)
app.config.update({
'SECRET_KEY': os.environ['SECRET'],
'DEBUG': False,
'DEBUG': True,
'OIDC_CLIENT_SECRETS': json.loads(os.environ['CLIENT_SECRETS']),
'OIDC_ID_TOKEN_COOKIE_SECURE': False,
'OIDC_ID_TOKEN_COOKIE_SECURE': True,
'OIDC_USER_INFO_ENABLED': True,
'OIDC_OPENID_REALM': 'hottis',
'OIDC_SCOPES': ['openid', 'email', 'profile']
'OIDC_SCOPES': ['openid', 'email'],
'SESSION_TYPE': 'redis',
'SESSION_PERMANENT': False,
'SESSION_USE_SIGNER': True,
'SESSION_KEY_PREFIX': 'nutri',
'SESSION_REDIS': redis.StrictRedis(host='redis-master.redis.svc.cluster.local', port=6379, db=4)
})
oidc = OpenIDConnect(app)
logging.basicConfig(level=logging.DEBUG)
app.logger.handlers = logging.getLogger('gunicorn.error').handlers
datapw = 'dasrtwegdffgtewrt4335wferg'
@ -73,14 +81,14 @@ def schulrunden(zahl, stellen=0, ist_kcal=False):
# Index-Route
@app.route('/')
@oidc.require_login
# @oidc.require_login
def index():
return render_template('index.html')
# ...
@app.route('/get_products')
@oidc.require_login
# @oidc.require_login
def get_products():
try:
conn = psycopg2.connect()
@ -95,7 +103,7 @@ def get_products():
# Route zum Hinzufügen und Berechnen von Lebensmitteln
@app.route('/add_lm', methods=['GET'])
@oidc.require_login
# @oidc.require_login
def add_lm():
food = request.args.get('food')
weight = float(request.args.get('weight'))
@ -125,7 +133,7 @@ def convert_decimal(value):
@app.route('/add_nutrition', methods=['POST'])
@oidc.accept_token(['openid'])
# @oidc.accept_token(['openid'])
def add_nutrition():
app.logger.info("add_nutrition")
@ -155,18 +163,18 @@ def add_nutrition():
@app.route('/nutrition')
@oidc.require_login
# @oidc.require_login
def nutrition():
return render_template('nutrition.html')
@app.route('/get_token')
@oidc.require_login
# @oidc.require_login
def get_token():
return jsonify(token=oidc.get_access_token())
@app.route('/get_database_entries')
@oidc.require_login
# @oidc.require_login
def get_database_entries():
try:
# Ersetzen Sie diese Werte mit Ihren Datenbank-Verbindungsinformationen
@ -197,7 +205,7 @@ def get_database_entries():
@app.route('/delete_nutrition', methods=['POST'])
@oidc.accept_token(['openid'])
# @oidc.accept_token(['openid'])
def delete_nutrition():
data = request.get_json()
foodNames = data['foodNames']
@ -220,6 +228,7 @@ def delete_nutrition():
@app.route('/random')
@oidc.require_login
def random_page():
# Diese Route gibt die HTML-Seite 'random.html' zurück
return render_template('random.html')
@ -227,4 +236,4 @@ def random_page():
exposed_app = ProxyFix(app, x_for=1, x_host=1)
#

View File

@ -20,3 +20,6 @@ requests==2.31.0
typing_extensions==4.9.0
urllib3==2.1.0
Werkzeug==3.0.1
Flask-Session
redis