generated from PlexSheep/rs-base
Compare commits
No commits in common. "devel" and "master" have entirely different histories.
|
|
@ -29,8 +29,11 @@ tokio = { version = "1.40.0", features = [
|
||||||
"rt",
|
"rt",
|
||||||
"sync",
|
"sync",
|
||||||
] }
|
] }
|
||||||
|
tracing = "0.1.40"
|
||||||
|
tracing-appender = "0.2.3"
|
||||||
|
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
|
||||||
warp = { version = "0.3.7", optional = true }
|
warp = { version = "0.3.7", optional = true }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["meta-interface"]
|
default = ["admin-interface"]
|
||||||
meta-interface = ["dep:warp", "dep:minijinja"]
|
admin-interface = ["dep:warp", "dep:minijinja"]
|
||||||
|
|
|
||||||
|
|
@ -1,157 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html lang="en" data-bs-theme="auto">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<script src="https://getbootstrap.com/docs/5.3/assets/js/color-modes.js"></script>
|
|
||||||
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<meta name="author" content="{{author}}">
|
|
||||||
<title>{{title}}</title>
|
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3">
|
|
||||||
<link href="https://getbootstrap.com/docs/5.3/dist/css/bootstrap.min.css" rel="stylesheet"
|
|
||||||
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
|
|
||||||
|
|
||||||
<!-- Favicons -->
|
|
||||||
<link rel="icon" href="https://icons.getbootstrap.com/assets/icons/safe-fill.svg">
|
|
||||||
<meta name="theme-color" content="#712cf9">
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="/styles.css">
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<!-- All the svgs we use later -->
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="d-none">
|
|
||||||
<symbol id="check2" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="circle-half" viewBox="0 0 16 16">
|
|
||||||
<path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="moon-stars-fill" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z" />
|
|
||||||
<path
|
|
||||||
d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="sun-fill" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="arrow-right-circle" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0zM4.5 7.5a.5.5 0 0 0 0 1h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H4.5z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="vault" viewBox="0 0 16 16">
|
|
||||||
<title>Bootstrap</title>
|
|
||||||
<path d="M9.778 9.414A2 2 0 1 1 6.95 6.586a2 2 0 0 1 2.828 2.828" />
|
|
||||||
<path
|
|
||||||
d="M2.5 0A1.5 1.5 0 0 0 1 1.5V3H.5a.5.5 0 0 0 0 1H1v3.5H.5a.5.5 0 0 0 0 1H1V12H.5a.5.5 0 0 0 0 1H1v1.5A1.5 1.5 0 0 0 2.5 16h12a1.5 1.5 0 0 0 1.5-1.5v-13A1.5 1.5 0 0 0 14.5 0zm3.036 4.464 1.09 1.09a3 3 0 0 1 3.476 0l1.09-1.09a.5.5 0 1 1 .707.708l-1.09 1.09c.74 1.037.74 2.44 0 3.476l1.09 1.09a.5.5 0 1 1-.707.708l-1.09-1.09a3 3 0 0 1-3.476 0l-1.09 1.09a.5.5 0 1 1-.708-.708l1.09-1.09a3 3 0 0 1 0-3.476l-1.09-1.09a.5.5 0 1 1 .708-.708M14 6.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 1 1 0" />
|
|
||||||
</symbol>
|
|
||||||
</svg>
|
|
||||||
|
|
||||||
<!-- theme switcher -->
|
|
||||||
<div class="dropdown position-fixed bottom-0 end-0 mb-3 me-3 bd-mode-toggle">
|
|
||||||
<button class="btn btn-bd-primary py-2 dropdown-toggle d-flex align-items-center" id="bd-theme" type="button"
|
|
||||||
aria-expanded="false" data-bs-toggle="dropdown" aria-label="Toggle theme (auto)">
|
|
||||||
<svg class="bi my-1 theme-icon-active" width="1em" height="1em">
|
|
||||||
<use href="#circle-half"></use>
|
|
||||||
</svg>
|
|
||||||
<span class="visually-hidden" id="bd-theme-text">Toggle theme</span>
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu dropdown-menu-end shadow" aria-labelledby="bd-theme-text">
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light"
|
|
||||||
aria-pressed="false">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#sun-fill"></use>
|
|
||||||
</svg>
|
|
||||||
Light
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark"
|
|
||||||
aria-pressed="false">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#moon-stars-fill"></use>
|
|
||||||
</svg>
|
|
||||||
Dark
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto"
|
|
||||||
aria-pressed="true">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#circle-half"></use>
|
|
||||||
</svg>
|
|
||||||
Auto
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- basically everything but with some margin -->
|
|
||||||
<div class="col-lg-8 mx-auto p-4 py-md-5">
|
|
||||||
<header class="d-flex align-items-center pb-3 mb-5 border-bottom">
|
|
||||||
<a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none">
|
|
||||||
<svg class="bi me-2" width="40" height="32">
|
|
||||||
<use xlink:href="#vault" />
|
|
||||||
</svg>
|
|
||||||
<span class="fs-4">{{title}}</span>
|
|
||||||
</a>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<main>
|
|
||||||
<h1 class="text-body-emphasis">{{title}} Admin Interface</h1>
|
|
||||||
<p class="fs-5 col-md-8">
|
|
||||||
You have reached the {{title}} Admin Interface. This site can be used by
|
|
||||||
the host of the challenge to see the challenge progress, solution, and
|
|
||||||
hints for that challenge. This site is <b>NOT</b> part of the
|
|
||||||
challenge.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<hr class="mb-5">
|
|
||||||
|
|
||||||
<div class="row g-5">
|
|
||||||
<div class="col-md-6">
|
|
||||||
<h2 class="text-body-emphasis">Challenges</h2>
|
|
||||||
<p>
|
|
||||||
There are cuttently {{ challenges_amount }} active challenges.
|
|
||||||
</p>
|
|
||||||
<ul class="list-unstyled ps-0">
|
|
||||||
{% for challenge in challenges %}
|
|
||||||
<li>
|
|
||||||
<a class="icon-link mb-1" href="challenge/{{ challenge.id }}">
|
|
||||||
<svg class="bi" width="16" height="16">
|
|
||||||
<use xlink:href="#arrow-right-circle" />
|
|
||||||
</svg>
|
|
||||||
{{ challenge.id }} — {{ challenge.title }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
<footer class="pt-5 my-5 text-body-secondary border-top">
|
|
||||||
Created by {{ author }} © {{year}}
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
<script src="https://getbootstrap.com/docs/5.3/dist/js/bootstrap.bundle.min.js"
|
|
||||||
integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
|
|
||||||
crossorigin="anonymous"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,207 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html lang="en" data-bs-theme="auto">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<script src="https://getbootstrap.com/docs/5.3/assets/js/color-modes.js"></script>
|
|
||||||
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<meta name="author" content="{{author}}">
|
|
||||||
<title>{{title}}</title>
|
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3">
|
|
||||||
<link href="https://getbootstrap.com/docs/5.3/dist/css/bootstrap.min.css" rel="stylesheet"
|
|
||||||
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
|
|
||||||
|
|
||||||
<!-- Favicons -->
|
|
||||||
<link rel="icon" href="https://icons.getbootstrap.com/assets/icons/safe-fill.svg">
|
|
||||||
<meta name="theme-color" content="#712cf9">
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="/styles.css">
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<!-- All the svgs we use later -->
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="d-none">
|
|
||||||
<symbol id="check2" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="circle-half" viewBox="0 0 16 16">
|
|
||||||
<path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="moon-stars-fill" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z" />
|
|
||||||
<path
|
|
||||||
d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="sun-fill" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="arrow-right-circle" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0zM4.5 7.5a.5.5 0 0 0 0 1h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H4.5z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="vault" viewBox="0 0 16 16">
|
|
||||||
<title>Bootstrap</title>
|
|
||||||
<path d="M9.778 9.414A2 2 0 1 1 6.95 6.586a2 2 0 0 1 2.828 2.828" />
|
|
||||||
<path
|
|
||||||
d="M2.5 0A1.5 1.5 0 0 0 1 1.5V3H.5a.5.5 0 0 0 0 1H1v3.5H.5a.5.5 0 0 0 0 1H1V12H.5a.5.5 0 0 0 0 1H1v1.5A1.5 1.5 0 0 0 2.5 16h12a1.5 1.5 0 0 0 1.5-1.5v-13A1.5 1.5 0 0 0 14.5 0zm3.036 4.464 1.09 1.09a3 3 0 0 1 3.476 0l1.09-1.09a.5.5 0 1 1 .707.708l-1.09 1.09c.74 1.037.74 2.44 0 3.476l1.09 1.09a.5.5 0 1 1-.707.708l-1.09-1.09a3 3 0 0 1-3.476 0l-1.09 1.09a.5.5 0 1 1-.708-.708l1.09-1.09a3 3 0 0 1 0-3.476l-1.09-1.09a.5.5 0 1 1 .708-.708M14 6.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 1 1 0" />
|
|
||||||
</symbol>
|
|
||||||
</svg>
|
|
||||||
|
|
||||||
<!-- theme switcher -->
|
|
||||||
<div class="dropdown position-fixed bottom-0 end-0 mb-3 me-3 bd-mode-toggle">
|
|
||||||
<button class="btn btn-bd-primary py-2 dropdown-toggle d-flex align-items-center" id="bd-theme" type="button"
|
|
||||||
aria-expanded="false" data-bs-toggle="dropdown" aria-label="Toggle theme (auto)">
|
|
||||||
<svg class="bi my-1 theme-icon-active" width="1em" height="1em">
|
|
||||||
<use href="#circle-half"></use>
|
|
||||||
</svg>
|
|
||||||
<span class="visually-hidden" id="bd-theme-text">Toggle theme</span>
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu dropdown-menu-end shadow" aria-labelledby="bd-theme-text">
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light"
|
|
||||||
aria-pressed="false">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#sun-fill"></use>
|
|
||||||
</svg>
|
|
||||||
Light
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark"
|
|
||||||
aria-pressed="false">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#moon-stars-fill"></use>
|
|
||||||
</svg>
|
|
||||||
Dark
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto"
|
|
||||||
aria-pressed="true">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#circle-half"></use>
|
|
||||||
</svg>
|
|
||||||
Auto
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- basically everything but with some margin -->
|
|
||||||
<div class="col-lg-8 mx-auto p-4 py-md-5">
|
|
||||||
<header class="d-flex align-items-center pb-3 mb-5 border-bottom">
|
|
||||||
<a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none">
|
|
||||||
<svg class="bi me-2" width="40" height="32">
|
|
||||||
<use xlink:href="#vault" />
|
|
||||||
</svg>
|
|
||||||
<span class="fs-4">{{title}}</span>
|
|
||||||
</a>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<main>
|
|
||||||
<h1 class="text-body-emphasis">{{title}} User Interface</h1>
|
|
||||||
<p class="fs-5 col-md-8">
|
|
||||||
You have reached the {{title}} User
|
|
||||||
Interface. This site can be used by the
|
|
||||||
contestants see the challenges and their
|
|
||||||
progress and hints for that challenge. This
|
|
||||||
site is <b>NOT</b> part of the challenge.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<hr class="mb-5">
|
|
||||||
|
|
||||||
<div class="row g-5 mb-5">
|
|
||||||
<h2 class="text-body-emphasis">Challenge {{ challenge_idx}} — {{ challenge_title }}</h2>
|
|
||||||
<p class="mt-1 mb-3">{{ challenge_description }}</p>
|
|
||||||
<div class="col mt-1">
|
|
||||||
<h3>Hints</h3>
|
|
||||||
<button class="btn btn-primary my-2" type="button" data-bs-toggle="collapse" data-bs-target="#hints"
|
|
||||||
aria-expanded="false" aria-controls="collapseExample">
|
|
||||||
Show hints
|
|
||||||
</button>
|
|
||||||
<div class="collapse" id="hints">
|
|
||||||
<ul class="list-unstyled ps-0">
|
|
||||||
{% for hint in challenge_hints %}
|
|
||||||
<li>
|
|
||||||
<p>
|
|
||||||
<svg class="bi" width="16" height="16">
|
|
||||||
<use xlink:href="#arrow-right-circle" />
|
|
||||||
</svg>
|
|
||||||
{{hint}}
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<hr class="mb-5">
|
|
||||||
|
|
||||||
<div class="row g-5">
|
|
||||||
<div class="col-md-6">
|
|
||||||
<h2 class="text-body-emphasis">Contestants</h2>
|
|
||||||
<p>
|
|
||||||
There are cuttently {{ contestants_amount }} contestants.
|
|
||||||
These contestants currently have had at least one connection to
|
|
||||||
the challenge:
|
|
||||||
</p>
|
|
||||||
<ul class="list-unstyled ps-0">
|
|
||||||
{% for contestant in contestants %}
|
|
||||||
<li>
|
|
||||||
<a class="icon-link mb-1" href="https://whatismyipaddress.com/ip/{{ contestant.ip }}">
|
|
||||||
<svg class="bi" width="16" height="16">
|
|
||||||
<use xlink:href="#arrow-right-circle" />
|
|
||||||
</svg>
|
|
||||||
{{ contestant.ip }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-md-6">
|
|
||||||
<h2 class="text-body-emphasis">Winners</h2>
|
|
||||||
<p>
|
|
||||||
There are cuttently {{ winners_amount }} winners. These contestants currently have been sent the
|
|
||||||
secret:
|
|
||||||
</p>
|
|
||||||
<ul class="list-unstyled ps-0">
|
|
||||||
{% for winner in winners %}
|
|
||||||
<li>
|
|
||||||
<a class="icon-link mb-1" href="https://whatismyipaddress.com/ip/{{ winner.ip }}">
|
|
||||||
<svg class="bi" width="16" height="16">
|
|
||||||
<use xlink:href="#arrow-right-circle" />
|
|
||||||
</svg>
|
|
||||||
{{ winner.ip }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
<footer class="pt-5 my-5 text-body-secondary border-top">
|
|
||||||
Created by {{ author }} © {{year}}
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
<script src="https://getbootstrap.com/docs/5.3/dist/js/bootstrap.bundle.min.js"
|
|
||||||
integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
|
|
||||||
crossorigin="anonymous"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,158 +0,0 @@
|
||||||
<!doctype html>
|
|
||||||
<html lang="en" data-bs-theme="auto">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<script src="https://getbootstrap.com/docs/5.3/assets/js/color-modes.js"></script>
|
|
||||||
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<meta name="author" content="{{author}}">
|
|
||||||
<title>{{title}}</title>
|
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3">
|
|
||||||
<link href="https://getbootstrap.com/docs/5.3/dist/css/bootstrap.min.css" rel="stylesheet"
|
|
||||||
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
|
|
||||||
|
|
||||||
<!-- Favicons -->
|
|
||||||
<link rel="icon" href="https://icons.getbootstrap.com/assets/icons/safe-fill.svg">
|
|
||||||
<meta name="theme-color" content="#712cf9">
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="/styles.css">
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<!-- All the svgs we use later -->
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="d-none">
|
|
||||||
<symbol id="check2" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="circle-half" viewBox="0 0 16 16">
|
|
||||||
<path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="moon-stars-fill" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z" />
|
|
||||||
<path
|
|
||||||
d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="sun-fill" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="arrow-right-circle" viewBox="0 0 16 16">
|
|
||||||
<path
|
|
||||||
d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0zM4.5 7.5a.5.5 0 0 0 0 1h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H4.5z" />
|
|
||||||
</symbol>
|
|
||||||
<symbol id="vault" viewBox="0 0 16 16">
|
|
||||||
<title>Bootstrap</title>
|
|
||||||
<path d="M9.778 9.414A2 2 0 1 1 6.95 6.586a2 2 0 0 1 2.828 2.828" />
|
|
||||||
<path
|
|
||||||
d="M2.5 0A1.5 1.5 0 0 0 1 1.5V3H.5a.5.5 0 0 0 0 1H1v3.5H.5a.5.5 0 0 0 0 1H1V12H.5a.5.5 0 0 0 0 1H1v1.5A1.5 1.5 0 0 0 2.5 16h12a1.5 1.5 0 0 0 1.5-1.5v-13A1.5 1.5 0 0 0 14.5 0zm3.036 4.464 1.09 1.09a3 3 0 0 1 3.476 0l1.09-1.09a.5.5 0 1 1 .707.708l-1.09 1.09c.74 1.037.74 2.44 0 3.476l1.09 1.09a.5.5 0 1 1-.707.708l-1.09-1.09a3 3 0 0 1-3.476 0l-1.09 1.09a.5.5 0 1 1-.708-.708l1.09-1.09a3 3 0 0 1 0-3.476l-1.09-1.09a.5.5 0 1 1 .708-.708M14 6.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 1 1 0" />
|
|
||||||
</symbol>
|
|
||||||
</svg>
|
|
||||||
|
|
||||||
<!-- theme switcher -->
|
|
||||||
<div class="dropdown position-fixed bottom-0 end-0 mb-3 me-3 bd-mode-toggle">
|
|
||||||
<button class="btn btn-bd-primary py-2 dropdown-toggle d-flex align-items-center" id="bd-theme" type="button"
|
|
||||||
aria-expanded="false" data-bs-toggle="dropdown" aria-label="Toggle theme (auto)">
|
|
||||||
<svg class="bi my-1 theme-icon-active" width="1em" height="1em">
|
|
||||||
<use href="#circle-half"></use>
|
|
||||||
</svg>
|
|
||||||
<span class="visually-hidden" id="bd-theme-text">Toggle theme</span>
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu dropdown-menu-end shadow" aria-labelledby="bd-theme-text">
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light"
|
|
||||||
aria-pressed="false">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#sun-fill"></use>
|
|
||||||
</svg>
|
|
||||||
Light
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark"
|
|
||||||
aria-pressed="false">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#moon-stars-fill"></use>
|
|
||||||
</svg>
|
|
||||||
Dark
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto"
|
|
||||||
aria-pressed="true">
|
|
||||||
<svg class="bi me-2 opacity-50" width="1em" height="1em">
|
|
||||||
<use href="#circle-half"></use>
|
|
||||||
</svg>
|
|
||||||
Auto
|
|
||||||
<svg class="bi ms-auto d-none" width="1em" height="1em">
|
|
||||||
<use href="#check2"></use>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- basically everything but with some margin -->
|
|
||||||
<div class="col-lg-8 mx-auto p-4 py-md-5">
|
|
||||||
<header class="d-flex align-items-center pb-3 mb-5 border-bottom">
|
|
||||||
<a href="/" class="d-flex align-items-center text-body-emphasis text-decoration-none">
|
|
||||||
<svg class="bi me-2" width="40" height="32">
|
|
||||||
<use xlink:href="#vault" />
|
|
||||||
</svg>
|
|
||||||
<span class="fs-4">{{title}}</span>
|
|
||||||
</a>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<main>
|
|
||||||
<h1 class="text-body-emphasis">{{title}} Admin Interface</h1>
|
|
||||||
<p class="fs-5 col-md-8">
|
|
||||||
You have reached the {{title}} User
|
|
||||||
Interface. This site can be used by the
|
|
||||||
contestants see the challenges and their
|
|
||||||
progress and hints for that challenge. This
|
|
||||||
site is <b>NOT</b> part of the challenge.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<hr class="mb-5">
|
|
||||||
|
|
||||||
<div class="row g-5">
|
|
||||||
<div class="col-md-6">
|
|
||||||
<h2 class="text-body-emphasis">Challenges</h2>
|
|
||||||
<p>
|
|
||||||
There are cuttently {{ challenges_amount }} active challenges.
|
|
||||||
</p>
|
|
||||||
<ul class="list-unstyled ps-0">
|
|
||||||
{% for challenge in challenges %}
|
|
||||||
<li>
|
|
||||||
<a class="icon-link mb-1" href="challenge/{{ challenge.id }}">
|
|
||||||
<svg class="bi" width="16" height="16">
|
|
||||||
<use xlink:href="#arrow-right-circle" />
|
|
||||||
</svg>
|
|
||||||
{{ challenge.id }} — {{ challenge.title }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
<footer class="pt-5 my-5 text-body-secondary border-top">
|
|
||||||
Created by {{ author }} © {{year}}
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
<script src="https://getbootstrap.com/docs/5.3/dist/js/bootstrap.bundle.min.js"
|
|
||||||
integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
|
|
||||||
crossorigin="anonymous"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
|
|
@ -2,7 +2,7 @@ from io import BufferedRWPair
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
REMOTE = "127.0.0.1"
|
REMOTE = "127.0.0.1"
|
||||||
PORT = 1338
|
PORT = 1337
|
||||||
|
|
||||||
def main() -> int:
|
def main() -> int:
|
||||||
s = socket.socket()
|
s = socket.socket()
|
||||||
|
|
@ -12,7 +12,6 @@ def main() -> int:
|
||||||
pl = int.to_bytes(1337, 2, "big")
|
pl = int.to_bytes(1337, 2, "big")
|
||||||
|
|
||||||
_ = send(sf, pl)
|
_ = send(sf, pl)
|
||||||
_ = recv(sf).decode()
|
|
||||||
|
|
||||||
sf.close()
|
sf.close()
|
||||||
return 0
|
return 0
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
from io import TextIOWrapper
|
from io import TextIOWrapper
|
||||||
import socket
|
import socket
|
||||||
|
import time
|
||||||
|
|
||||||
REMOTE = "127.0.0.1"
|
REMOTE = "127.0.0.1"
|
||||||
PORT = 1339
|
PORT = 1337
|
||||||
MAX_GUARD = 300
|
MAX_GUARD = 300
|
||||||
|
|
||||||
def calc(a: int, b: int, op: str) -> int:
|
def calc(a: int, b: int, op: str) -> int:
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,146 @@
|
||||||
|
use std::fmt::Display;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use anyhow::Result;
|
||||||
|
use libpt::log::error;
|
||||||
|
use libpt::log::info;
|
||||||
|
use libpt::log::tracing;
|
||||||
|
use libpt::log::warn;
|
||||||
|
use minijinja::context;
|
||||||
|
use minijinja::Environment;
|
||||||
|
use thiserror::Error;
|
||||||
|
use warp::http::StatusCode;
|
||||||
|
use warp::reject;
|
||||||
|
use warp::reply::Response;
|
||||||
|
use warp::Filter;
|
||||||
|
|
||||||
|
use crate::config::Config;
|
||||||
|
use crate::vault::VaultRef;
|
||||||
|
|
||||||
|
use super::Descriptions;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Service<'tp> {
|
||||||
|
vault: VaultRef,
|
||||||
|
config: Config,
|
||||||
|
env: Environment<'tp>,
|
||||||
|
text: Descriptions,
|
||||||
|
}
|
||||||
|
impl<'tp> Service<'tp> {
|
||||||
|
fn new(
|
||||||
|
vault: VaultRef,
|
||||||
|
config: Config,
|
||||||
|
env: Environment<'tp>,
|
||||||
|
text: Descriptions,
|
||||||
|
) -> Arc<Self> {
|
||||||
|
Self {
|
||||||
|
vault,
|
||||||
|
config,
|
||||||
|
env,
|
||||||
|
text,
|
||||||
|
}
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn serve(text: Descriptions, vault: VaultRef, config: Config) -> Result<()> {
|
||||||
|
let mut env = Environment::new();
|
||||||
|
env.add_template("index", include_str!("../../data/www/admin.html"))?;
|
||||||
|
|
||||||
|
let service = Service::new(vault, config, env, text);
|
||||||
|
let service2 = service.clone();
|
||||||
|
|
||||||
|
let routes = warp::path::end()
|
||||||
|
.map(move || service2.clone())
|
||||||
|
.and_then(overview)
|
||||||
|
.or(warp::path("styles.css").and_then(styles))
|
||||||
|
.recover(handle_rejection)
|
||||||
|
.with(warp::trace(|info| {
|
||||||
|
// Create a span using tracing macros
|
||||||
|
tracing::info_span!(
|
||||||
|
"admin",
|
||||||
|
method = %info.method(),
|
||||||
|
path = %info.path(),
|
||||||
|
)
|
||||||
|
}));
|
||||||
|
|
||||||
|
warp::serve(routes)
|
||||||
|
.run(service.config.addr_admin.unwrap())
|
||||||
|
.await;
|
||||||
|
|
||||||
|
warn!("exited the admin interface");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Error)]
|
||||||
|
struct TemplateError(#[from] minijinja::Error);
|
||||||
|
|
||||||
|
impl reject::Reject for TemplateError {}
|
||||||
|
impl Display for TemplateError {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
write!(f, "something went wrong with producing this page")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn overview(serv: Arc<Service<'_>>) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
|
||||||
|
let contestants = serv
|
||||||
|
.vault
|
||||||
|
.contestants()
|
||||||
|
.await
|
||||||
|
.into_iter()
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let winners = serv.vault.winners().await.into_iter().collect::<Vec<_>>();
|
||||||
|
let r = Response::new(
|
||||||
|
serv.env
|
||||||
|
.get_template("index")
|
||||||
|
.map_err(TemplateError::from)?
|
||||||
|
.render(context!(
|
||||||
|
title => "Wooly-Vault",
|
||||||
|
author => env!("CARGO_PKG_AUTHORS"),
|
||||||
|
year => "2024",
|
||||||
|
challenge_idx => serv.config.challenge,
|
||||||
|
challenge_title => serv.text.title(),
|
||||||
|
challenge_description => serv.text.description(),
|
||||||
|
challenge_hints => serv.text.hints(),
|
||||||
|
challenge_solution => serv.text.solution(),
|
||||||
|
contestants => serv.vault.contestants().await.iter().collect::<Vec<_>>(),
|
||||||
|
winners => serv.vault.winners().await.iter().collect::<Vec<_>>(),
|
||||||
|
contestants => contestants,
|
||||||
|
winners => winners,
|
||||||
|
contestants_amount => contestants.len(),
|
||||||
|
winners_amount => winners.len(),
|
||||||
|
))
|
||||||
|
.map_err(TemplateError::from)?
|
||||||
|
.into(),
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(Box::new(r))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn styles() -> Result<Box<dyn warp::Reply>, warp::Rejection> {
|
||||||
|
let r = Response::new(include_str!("../../data/www/styles.css").to_string().into());
|
||||||
|
Ok(Box::new(r))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_rejection(
|
||||||
|
err: reject::Rejection,
|
||||||
|
) -> Result<impl warp::reply::Reply, std::convert::Infallible> {
|
||||||
|
let code;
|
||||||
|
let message;
|
||||||
|
info!("rejecting: {err:?}");
|
||||||
|
|
||||||
|
if err.is_not_found() {
|
||||||
|
code = StatusCode::NOT_FOUND;
|
||||||
|
message = "page not found";
|
||||||
|
} else if let Some(e) = err.find::<TemplateError>() {
|
||||||
|
error!("templating error: {e}");
|
||||||
|
code = StatusCode::INTERNAL_SERVER_ERROR;
|
||||||
|
message = "could not process data to make a page";
|
||||||
|
} else {
|
||||||
|
error!("unhandled rejection: {:?}", err);
|
||||||
|
code = StatusCode::INTERNAL_SERVER_ERROR;
|
||||||
|
message = "unhandled rejection";
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(warp::reply::with_status(message, code))
|
||||||
|
}
|
||||||
|
|
@ -3,27 +3,24 @@
|
||||||
//! This challenge is designed to be simple and straightforward, requiring the contestant to only
|
//! This challenge is designed to be simple and straightforward, requiring the contestant to only
|
||||||
//! establish a TCP connection to the server to receive the secret.
|
//! establish a TCP connection to the server to receive the secret.
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use libpt::log::warn;
|
use libpt::log::warn;
|
||||||
use tokio::io::AsyncWriteExt;
|
use tokio::io::AsyncWriteExt;
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
|
|
||||||
use super::{ChallengeDesc, ChallengeLike};
|
use super::{Challenge, Descriptions};
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::has_won;
|
use crate::has_won;
|
||||||
use crate::vault::VaultRef;
|
use crate::vault::VaultRef;
|
||||||
|
|
||||||
/// This struct holds the configuration and vault for the challenge.
|
/// This struct holds the configuration and vault for the challenge.
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
pub struct C1 {
|
pub struct C1 {
|
||||||
config: Config,
|
config: Config,
|
||||||
vault: VaultRef,
|
vault: VaultRef,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ChallengeLike for C1 {
|
impl Challenge for C1 {
|
||||||
fn config(&self) -> Config {
|
fn config(&self) -> Config {
|
||||||
self.config.clone()
|
self.config.clone()
|
||||||
}
|
}
|
||||||
|
|
@ -34,9 +31,8 @@ impl ChallengeLike for C1 {
|
||||||
Self { config, vault }
|
Self { config, vault }
|
||||||
}
|
}
|
||||||
|
|
||||||
fn text() -> ChallengeDesc {
|
fn text() -> Descriptions {
|
||||||
ChallengeDesc {
|
Descriptions {
|
||||||
id: 1,
|
|
||||||
title: "dumb TCP".to_string(),
|
title: "dumb TCP".to_string(),
|
||||||
hints: vec![String::from("TCP connect to 1337.")],
|
hints: vec![String::from("TCP connect to 1337.")],
|
||||||
solution: String::from("Connect by TCP, then the secret will be sent to you."),
|
solution: String::from("Connect by TCP, then the secret will be sent to you."),
|
||||||
|
|
@ -44,8 +40,8 @@ impl ChallengeLike for C1 {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn serve(&self, addr: SocketAddr) -> anyhow::Result<()> {
|
async fn serve(&self) -> anyhow::Result<()> {
|
||||||
let listener = TcpListener::bind(addr).await?;
|
let listener = TcpListener::bind(self.config.addr).await?;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let vault = self.vault.clone();
|
let vault = self.vault.clone();
|
||||||
|
|
|
||||||
|
|
@ -4,21 +4,18 @@
|
||||||
//! This challenge is designed to be simple and straightforward, but still requires some thinkering
|
//! This challenge is designed to be simple and straightforward, but still requires some thinkering
|
||||||
//! for newbies, especially those that sill only think in text.
|
//! for newbies, especially those that sill only think in text.
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use libpt::log::{info, warn};
|
use libpt::log::{info, warn};
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
use tokio::net::{TcpListener, TcpStream};
|
use tokio::net::{TcpListener, TcpStream};
|
||||||
|
|
||||||
use super::{ChallengeDesc, ChallengeLike};
|
use super::{Challenge, Descriptions};
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::has_won;
|
use crate::has_won;
|
||||||
use crate::vault::VaultRef;
|
use crate::vault::VaultRef;
|
||||||
|
|
||||||
/// This struct holds the configuration and vault for the challenge.
|
/// This struct holds the configuration and vault for the challenge.
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
pub struct C2 {
|
pub struct C2 {
|
||||||
config: Config,
|
config: Config,
|
||||||
vault: VaultRef,
|
vault: VaultRef,
|
||||||
|
|
@ -49,7 +46,7 @@ impl C2 {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ChallengeLike for C2 {
|
impl Challenge for C2 {
|
||||||
fn config(&self) -> Config {
|
fn config(&self) -> Config {
|
||||||
self.config.clone()
|
self.config.clone()
|
||||||
}
|
}
|
||||||
|
|
@ -59,9 +56,8 @@ impl ChallengeLike for C2 {
|
||||||
fn new(config: Config, vault: VaultRef) -> Self {
|
fn new(config: Config, vault: VaultRef) -> Self {
|
||||||
Self { config, vault }
|
Self { config, vault }
|
||||||
}
|
}
|
||||||
fn text() -> ChallengeDesc {
|
fn text() -> Descriptions {
|
||||||
ChallengeDesc {
|
Descriptions {
|
||||||
id: 2,
|
|
||||||
title: "TCP dialogue".to_string(),
|
title: "TCP dialogue".to_string(),
|
||||||
hints: vec![String::from(
|
hints: vec![String::from(
|
||||||
"TCP connect to 1337 and give me a special u16",
|
"TCP connect to 1337 and give me a special u16",
|
||||||
|
|
@ -71,8 +67,8 @@ impl ChallengeLike for C2 {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn serve(&self, addr: SocketAddr) -> anyhow::Result<()> {
|
async fn serve(&self) -> anyhow::Result<()> {
|
||||||
let listener = TcpListener::bind(addr).await?;
|
let listener = TcpListener::bind(self.config.addr).await?;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let vault = self.vault.clone();
|
let vault = self.vault.clone();
|
||||||
|
|
|
||||||
|
|
@ -22,14 +22,14 @@ use std::net::SocketAddr;
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use libpt::log::{debug, warn};
|
use libpt::log::{debug, info, warn};
|
||||||
use rand::distributions::{Distribution, Standard};
|
use rand::distributions::{Distribution, Standard};
|
||||||
use rand::{random, Rng};
|
use rand::{random, Rng};
|
||||||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
||||||
use tokio::net::{TcpListener, TcpStream};
|
use tokio::net::{TcpListener, TcpStream};
|
||||||
use tokio::time::Instant;
|
use tokio::time::Instant;
|
||||||
|
|
||||||
use super::{ChallengeDesc, ChallengeLike};
|
use super::{Challenge, Descriptions};
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::has_won;
|
use crate::has_won;
|
||||||
use crate::vault::VaultRef;
|
use crate::vault::VaultRef;
|
||||||
|
|
@ -40,7 +40,7 @@ pub const NEEDED_CORRECT: usize = 16;
|
||||||
pub const MILLIS_PER_QUESTION: u128 = 200;
|
pub const MILLIS_PER_QUESTION: u128 = 200;
|
||||||
|
|
||||||
/// Signifies the operations that the randomiser can come up with.
|
/// Signifies the operations that the randomiser can come up with.
|
||||||
#[derive(Copy, Clone, Debug)]
|
#[derive(Copy, Clone)]
|
||||||
enum Operation {
|
enum Operation {
|
||||||
Add,
|
Add,
|
||||||
Sub,
|
Sub,
|
||||||
|
|
@ -90,7 +90,6 @@ impl Distribution<Operation> for Standard {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This struct holds the configuration and vault for the challenge.
|
/// This struct holds the configuration and vault for the challenge.
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
pub struct C3 {
|
pub struct C3 {
|
||||||
config: Config,
|
config: Config,
|
||||||
vault: VaultRef,
|
vault: VaultRef,
|
||||||
|
|
@ -207,7 +206,7 @@ impl C3 {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ChallengeLike for C3 {
|
impl Challenge for C3 {
|
||||||
fn config(&self) -> Config {
|
fn config(&self) -> Config {
|
||||||
self.config.clone()
|
self.config.clone()
|
||||||
}
|
}
|
||||||
|
|
@ -217,9 +216,8 @@ impl ChallengeLike for C3 {
|
||||||
fn new(config: Config, vault: VaultRef) -> Self {
|
fn new(config: Config, vault: VaultRef) -> Self {
|
||||||
Self { config, vault }
|
Self { config, vault }
|
||||||
}
|
}
|
||||||
fn text() -> ChallengeDesc {
|
fn text() -> Descriptions {
|
||||||
ChallengeDesc {
|
Descriptions {
|
||||||
id: 3,
|
|
||||||
title: "TCP math exam".to_string(),
|
title: "TCP math exam".to_string(),
|
||||||
hints: vec![
|
hints: vec![
|
||||||
"TCP connect to 1337 and answer the questions.".to_string(),
|
"TCP connect to 1337 and answer the questions.".to_string(),
|
||||||
|
|
@ -231,8 +229,9 @@ impl ChallengeLike for C3 {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn serve(&self, addr: SocketAddr) -> anyhow::Result<()> {
|
async fn serve(&self) -> anyhow::Result<()> {
|
||||||
let listener = TcpListener::bind(addr).await?;
|
info!("serving challenge 3");
|
||||||
|
let listener = TcpListener::bind(self.config.addr).await?;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let vault = self.vault.clone();
|
let vault = self.vault.clone();
|
||||||
|
|
|
||||||
|
|
@ -3,29 +3,28 @@
|
||||||
//! This module is the core of the Wooly Vault application, as it defines the interface that all
|
//! This module is the core of the Wooly Vault application, as it defines the interface that all
|
||||||
//! challenges must implement, and contains the challenge modules themselves.
|
//! challenges must implement, and contains the challenge modules themselves.
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
use anyhow::anyhow;
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use libpt::log::{error, info};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::vault::VaultRef;
|
use crate::vault::VaultRef;
|
||||||
|
|
||||||
|
#[cfg(feature = "admin-interface")]
|
||||||
|
pub mod admin;
|
||||||
|
|
||||||
pub mod c1;
|
pub mod c1;
|
||||||
pub mod c2;
|
pub mod c2;
|
||||||
pub mod c3;
|
pub mod c3;
|
||||||
|
|
||||||
#[derive(Clone, PartialEq, Eq, Hash, Debug, Serialize, Deserialize)]
|
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
|
||||||
pub struct ChallengeDesc {
|
pub struct Descriptions {
|
||||||
id: usize,
|
|
||||||
title: String,
|
title: String,
|
||||||
hints: Vec<String>,
|
hints: Vec<String>,
|
||||||
solution: String,
|
solution: String,
|
||||||
description: String,
|
description: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ChallengeDesc {
|
impl Descriptions {
|
||||||
/// Returns a list of hints for the challenge.
|
/// Returns a list of hints for the challenge.
|
||||||
///
|
///
|
||||||
/// A hint is a short text to be given to the contestants in case the admin thinks they need
|
/// A hint is a short text to be given to the contestants in case the admin thinks they need
|
||||||
|
|
@ -33,8 +32,8 @@ impl ChallengeDesc {
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
///
|
///
|
||||||
/// A [`Vec<String>`] containing hints for the challenge.
|
/// A vector of strings containing hints for the challenge.
|
||||||
pub fn hints(&self) -> Vec<&str> {
|
fn hints(&self) -> Vec<&str> {
|
||||||
self.hints.iter().map(|a| a.as_ref()).collect()
|
self.hints.iter().map(|a| a.as_ref()).collect()
|
||||||
}
|
}
|
||||||
/// Returns the solution to the challenge.
|
/// Returns the solution to the challenge.
|
||||||
|
|
@ -44,8 +43,8 @@ impl ChallengeDesc {
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
///
|
///
|
||||||
/// A [`String`] containing the solution to the challenge.
|
/// A string containing the solution to the challenge.
|
||||||
pub fn solution(&self) -> &str {
|
fn solution(&self) -> &str {
|
||||||
&self.solution
|
&self.solution
|
||||||
}
|
}
|
||||||
/// Returns the description to the challenge.
|
/// Returns the description to the challenge.
|
||||||
|
|
@ -55,8 +54,8 @@ impl ChallengeDesc {
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
///
|
///
|
||||||
/// A [`String`] containing the description to the challenge.
|
/// A string containing the description to the challenge.
|
||||||
pub fn description(&self) -> &str {
|
fn description(&self) -> &str {
|
||||||
&self.description
|
&self.description
|
||||||
}
|
}
|
||||||
/// Returns the title to the challenge.
|
/// Returns the title to the challenge.
|
||||||
|
|
@ -65,40 +64,26 @@ impl ChallengeDesc {
|
||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
///
|
///
|
||||||
/// A [`String`] containing the title to the challenge.
|
/// A string containing the title to the challenge.
|
||||||
pub fn title(&self) -> &str {
|
fn title(&self) -> &str {
|
||||||
&self.title
|
&self.title
|
||||||
}
|
}
|
||||||
/// Returns the id to the challenge.
|
|
||||||
///
|
|
||||||
/// The id is just the index of the challenge to distinguish them easily
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// A [`usize`] containing the title to the challenge.
|
|
||||||
pub fn id(&self) -> usize {
|
|
||||||
self.id
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Defines the behavior of a challenge.
|
/// Defines the behavior of a challenge.
|
||||||
///
|
///
|
||||||
/// Any type that implements this trait can be served as a challenge in the Wooly Vault application.
|
/// Any type that implements this trait can be served as a challenge in the Wooly Vault application.
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait ChallengeLike
|
pub trait Challenge
|
||||||
where
|
where
|
||||||
Self: Sized + 'static,
|
Self: Sized,
|
||||||
Self: Send,
|
|
||||||
Self: Sync,
|
|
||||||
Self: Clone,
|
|
||||||
Self: std::fmt::Debug,
|
|
||||||
{
|
{
|
||||||
/// Getter for the [vault](VaultRef).
|
/// Getter for the [vault](VaultRef).
|
||||||
fn vault(&self) -> VaultRef;
|
fn vault(&self) -> VaultRef;
|
||||||
/// Getter for the [Config].
|
/// Getter for the [Config].
|
||||||
fn config(&self) -> Config;
|
fn config(&self) -> Config;
|
||||||
/// Get the various texts for this challenge.
|
/// Get the various texts for this challenge.
|
||||||
fn text() -> ChallengeDesc;
|
fn text() -> Descriptions;
|
||||||
/// Creates a new instance of the challenge with the given configuration and vault.
|
/// Creates a new instance of the challenge with the given configuration and vault.
|
||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
|
|
@ -122,7 +107,7 @@ where
|
||||||
/// # Errors
|
/// # Errors
|
||||||
///
|
///
|
||||||
/// Will error when the challenge errors, for example when the network adress cannot be bound.
|
/// Will error when the challenge errors, for example when the network adress cannot be bound.
|
||||||
async fn serve(&self, addr: SocketAddr) -> anyhow::Result<()>;
|
async fn serve(&self) -> anyhow::Result<()>;
|
||||||
/// Serves a challenge and sets up the hint and monitoring service for the admin.
|
/// Serves a challenge and sets up the hint and monitoring service for the admin.
|
||||||
///
|
///
|
||||||
/// This method not only serves the challenge, but it also sets up a small webservice for the
|
/// This method not only serves the challenge, but it also sets up a small webservice for the
|
||||||
|
|
@ -137,14 +122,54 @@ where
|
||||||
/// # Returns
|
/// # Returns
|
||||||
///
|
///
|
||||||
/// A result indicating whether the challenge and the admin interface were successfully served.
|
/// A result indicating whether the challenge and the admin interface were successfully served.
|
||||||
async fn start(&self, addr: SocketAddr) -> anyhow::Result<()> {
|
async fn setup_and_start(self) -> anyhow::Result<()> {
|
||||||
let c = self.clone();
|
#[cfg(feature = "admin-interface")]
|
||||||
tokio::spawn(async move {
|
if self.config().addr_admin.is_some() {
|
||||||
info!("starting C{}", Self::text().id());
|
let vault = self.vault();
|
||||||
if let Err(e) = c.serve(addr).await {
|
let config = self.config();
|
||||||
error!("challenge {} has crashed! {e:#?}", Self::text().title());
|
tokio::spawn(Self::admin_interface(Self::text(), vault, config));
|
||||||
};
|
}
|
||||||
});
|
|
||||||
|
let challenge_handle = self.serve();
|
||||||
|
Ok(challenge_handle.await?)
|
||||||
|
}
|
||||||
|
#[cfg(feature = "admin-interface")]
|
||||||
|
async fn admin_interface(
|
||||||
|
text: Descriptions,
|
||||||
|
vault: VaultRef,
|
||||||
|
config: Config,
|
||||||
|
) -> anyhow::Result<()> {
|
||||||
|
admin::serve(text, vault, config).await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Selects a challenge by index and serves it with the given configuration and vault.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// * `index` - The index of the challenge to select.
|
||||||
|
/// * `config` - The configuration for the challenge.
|
||||||
|
/// * `vault` - The vault that holds the secret for the challenge.
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
///
|
||||||
|
/// A result indicating whether the challenge has successfully ended.
|
||||||
|
///
|
||||||
|
/// # Errors
|
||||||
|
///
|
||||||
|
/// Returns an error if no challenge with the given index exists, or if the challenge that is being
|
||||||
|
/// served errors.
|
||||||
|
pub async fn select_and_start(index: u16, config: Config, vault: VaultRef) -> anyhow::Result<()> {
|
||||||
|
match index {
|
||||||
|
1 => c1::C1::new(config, vault).setup_and_start().await?,
|
||||||
|
2 => c2::C2::new(config, vault).setup_and_start().await?,
|
||||||
|
3 => c3::C3::new(config, vault).setup_and_start().await?,
|
||||||
|
_ => {
|
||||||
|
return Err(anyhow!(
|
||||||
|
"no challenge with index {index} does currently exist"
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
|
||||||
82
src/lib.rs
82
src/lib.rs
|
|
@ -14,19 +14,10 @@
|
||||||
//! Wooly Vault is programmed asynchronously with [tokio] to be able to handle many contestants at
|
//! Wooly Vault is programmed asynchronously with [tokio] to be able to handle many contestants at
|
||||||
//! once if needed.
|
//! once if needed.
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
|
||||||
|
|
||||||
use anyhow::anyhow;
|
|
||||||
use libpt::log::info;
|
|
||||||
|
|
||||||
use self::challenge::ChallengeLike;
|
|
||||||
use self::config::Config;
|
|
||||||
use self::vault::VaultRef;
|
use self::vault::VaultRef;
|
||||||
|
|
||||||
pub mod challenge;
|
pub mod challenge;
|
||||||
pub mod config;
|
pub mod config;
|
||||||
#[cfg(feature = "meta-interface")]
|
|
||||||
pub mod meta;
|
|
||||||
pub mod vault;
|
pub mod vault;
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
|
|
@ -38,76 +29,3 @@ pub(crate) async fn has_won(
|
||||||
vault.add_winner(contestant.clone()).await;
|
vault.add_winner(contestant.clone()).await;
|
||||||
libpt::log::info!("Sending the secret to {addr}")
|
libpt::log::info!("Sending the secret to {addr}")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Selects a single challenge by index and serves it with the given configuration and vault.
|
|
||||||
///
|
|
||||||
/// # Arguments
|
|
||||||
///
|
|
||||||
/// * `index` - The index of the challenge to select.
|
|
||||||
/// * `config` - The configuration for the challenge.
|
|
||||||
/// * `vault` - The vault that holds the secret for the challenge.
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// A result indicating whether the challenge has successfully ended.
|
|
||||||
///
|
|
||||||
/// # Errors
|
|
||||||
///
|
|
||||||
/// Returns an error if no challenge with the given index exists, or if the challenge that is being
|
|
||||||
/// served errors.
|
|
||||||
pub async fn select_and_start_single(
|
|
||||||
index: u16,
|
|
||||||
config: Config,
|
|
||||||
vault: VaultRef,
|
|
||||||
) -> anyhow::Result<()> {
|
|
||||||
info!("select+start");
|
|
||||||
match index {
|
|
||||||
1 => {
|
|
||||||
challenge::c1::C1::new(config.clone(), vault)
|
|
||||||
.start(config.addr)
|
|
||||||
.await?
|
|
||||||
}
|
|
||||||
2 => {
|
|
||||||
challenge::c2::C2::new(config.clone(), vault)
|
|
||||||
.start(config.addr)
|
|
||||||
.await?
|
|
||||||
}
|
|
||||||
3 => {
|
|
||||||
challenge::c3::C3::new(config.clone(), vault)
|
|
||||||
.start(config.addr)
|
|
||||||
.await?
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
return Err(anyhow!(
|
|
||||||
"no challenge with index {index} does currently exist"
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: actually use different vaults for the challenges #7
|
|
||||||
pub async fn start_all(config: Config, vault: VaultRef) -> anyhow::Result<()> {
|
|
||||||
let ip = config.addr.ip();
|
|
||||||
let start_port = config.addr.port();
|
|
||||||
|
|
||||||
let c1 = challenge::c1::C1::new(config.clone(), vault.clone());
|
|
||||||
let c2 = challenge::c2::C2::new(config.clone(), vault.clone());
|
|
||||||
let c3 = challenge::c3::C3::new(config.clone(), vault.clone());
|
|
||||||
|
|
||||||
c1.start(SocketAddr::new(ip, start_port)).await?;
|
|
||||||
c2.start(SocketAddr::new(ip, start_port + 1)).await?;
|
|
||||||
c3.start(SocketAddr::new(ip, start_port + 2)).await?;
|
|
||||||
|
|
||||||
meta::serve(
|
|
||||||
vec![
|
|
||||||
(challenge::c1::C1::text(), vault.clone()),
|
|
||||||
(challenge::c2::C2::text(), vault.clone()),
|
|
||||||
(challenge::c3::C3::text(), vault.clone()),
|
|
||||||
],
|
|
||||||
config.clone(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,7 @@ use anyhow::Result;
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use libpt::log::{debug, info};
|
use libpt::log::{debug, info};
|
||||||
|
|
||||||
use wooly_vault::start_all;
|
use wooly_vault::{challenge::select_and_start, config::Config, vault::Vault};
|
||||||
use wooly_vault::{config::Config, vault::Vault};
|
|
||||||
|
|
||||||
#[tokio::main(flavor = "current_thread")]
|
#[tokio::main(flavor = "current_thread")]
|
||||||
async fn main() -> Result<()> {
|
async fn main() -> Result<()> {
|
||||||
|
|
@ -22,9 +21,7 @@ async fn main() -> Result<()> {
|
||||||
let secret = Config::secret()?;
|
let secret = Config::secret()?;
|
||||||
let v = Vault::new(&secret);
|
let v = Vault::new(&secret);
|
||||||
|
|
||||||
start_all(conf, v).await?;
|
select_and_start(conf.challenge, conf, v).await?;
|
||||||
|
|
||||||
loop {
|
Ok(())
|
||||||
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use anyhow::Result;
|
|
||||||
use libpt::log::tracing;
|
|
||||||
use minijinja::context;
|
|
||||||
use warp::reject::Rejection;
|
|
||||||
use warp::reply::Reply;
|
|
||||||
use warp::reply::Response;
|
|
||||||
use warp::Filter;
|
|
||||||
|
|
||||||
use crate::challenge::ChallengeDesc;
|
|
||||||
use crate::vault::VaultRef;
|
|
||||||
|
|
||||||
use super::errors::TemplateError;
|
|
||||||
use super::Service;
|
|
||||||
|
|
||||||
fn with_serv(
|
|
||||||
serv: Arc<Service>,
|
|
||||||
) -> impl Filter<Extract = (Arc<Service>,), Error = std::convert::Infallible> + Clone {
|
|
||||||
warp::any().map(move || serv.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'tp> Service<'tp> {
|
|
||||||
pub fn admin_routes(
|
|
||||||
this: Arc<Self>,
|
|
||||||
) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone + 'tp {
|
|
||||||
let serv = this.clone();
|
|
||||||
warp::path!("admin" / "challenge" / usize)
|
|
||||||
.map(move |id: usize| serv.challenges[id - 1].clone())
|
|
||||||
.and(with_serv(this.clone()))
|
|
||||||
.and_then(details)
|
|
||||||
.with(warp::trace(|info| {
|
|
||||||
// Create a span using tracing macros
|
|
||||||
tracing::info_span!(
|
|
||||||
"admin",
|
|
||||||
method = %info.method(),
|
|
||||||
path = %info.path(),
|
|
||||||
)
|
|
||||||
}))
|
|
||||||
.or(warp::path!("admin").and(with_serv(this.clone()).and_then(index)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn details(
|
|
||||||
data: (ChallengeDesc, VaultRef),
|
|
||||||
serv: Arc<Service<'_>>,
|
|
||||||
) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
|
|
||||||
let challenge = data.0;
|
|
||||||
let vault = data.1;
|
|
||||||
let contestants = vault.contestants().await.into_iter().collect::<Vec<_>>();
|
|
||||||
let winners = vault.winners().await.into_iter().collect::<Vec<_>>();
|
|
||||||
let r = Response::new(
|
|
||||||
serv.env
|
|
||||||
.get_template("admin:details")
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.render(context!(
|
|
||||||
title => "Wooly-Vault",
|
|
||||||
author => env!("CARGO_PKG_AUTHORS"),
|
|
||||||
year => "2024",
|
|
||||||
challenge_idx => challenge.id(),
|
|
||||||
challenge_title => challenge.title(),
|
|
||||||
challenge_description => challenge.description(),
|
|
||||||
challenge_hints => challenge.hints(),
|
|
||||||
challenge_solution => challenge.solution(),
|
|
||||||
contestants => vault.contestants().await.iter().collect::<Vec<_>>(),
|
|
||||||
winners => vault.winners().await.iter().collect::<Vec<_>>(),
|
|
||||||
contestants => contestants,
|
|
||||||
winners => winners,
|
|
||||||
contestants_amount => contestants.len(),
|
|
||||||
winners_amount => winners.len(),
|
|
||||||
))
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(Box::new(r))
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn index(serv: Arc<Service<'_>>) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
|
|
||||||
let challenges = serv
|
|
||||||
.challenges
|
|
||||||
.iter()
|
|
||||||
.map(|v| v.0.to_owned())
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let r = Response::new(
|
|
||||||
serv.env
|
|
||||||
.get_template("admin:index")
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.render(context!(
|
|
||||||
title => "Wooly-Vault",
|
|
||||||
author => env!("CARGO_PKG_AUTHORS"),
|
|
||||||
year => "2024",
|
|
||||||
challenges => challenges,
|
|
||||||
challenges_amount => challenges.len(),
|
|
||||||
))
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
Ok(Box::new(r))
|
|
||||||
}
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
use std::fmt::Display;
|
|
||||||
|
|
||||||
use libpt::log::{error, info};
|
|
||||||
use thiserror::Error;
|
|
||||||
use warp::http::StatusCode;
|
|
||||||
use warp::reject;
|
|
||||||
|
|
||||||
#[derive(Debug, Error)]
|
|
||||||
pub struct TemplateError(#[from] minijinja::Error);
|
|
||||||
|
|
||||||
impl reject::Reject for TemplateError {}
|
|
||||||
impl Display for TemplateError {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
write!(f, "something went wrong with producing this page")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn handle_rejection(
|
|
||||||
err: reject::Rejection,
|
|
||||||
) -> Result<impl warp::reply::Reply, std::convert::Infallible> {
|
|
||||||
let code;
|
|
||||||
let message;
|
|
||||||
info!("rejecting: {err:?}");
|
|
||||||
|
|
||||||
if err.is_not_found() {
|
|
||||||
code = StatusCode::NOT_FOUND;
|
|
||||||
message = "page not found";
|
|
||||||
} else if let Some(e) = err.find::<TemplateError>() {
|
|
||||||
error!("templating error: {e}");
|
|
||||||
code = StatusCode::INTERNAL_SERVER_ERROR;
|
|
||||||
message = "could not process data to make a page";
|
|
||||||
} else {
|
|
||||||
error!("unhandled rejection: {:?}", err);
|
|
||||||
code = StatusCode::INTERNAL_SERVER_ERROR;
|
|
||||||
message = "unhandled rejection";
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(warp::reply::with_status(message, code))
|
|
||||||
}
|
|
||||||
|
|
@ -1,83 +0,0 @@
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use anyhow::Result;
|
|
||||||
use libpt::log::tracing;
|
|
||||||
use libpt::log::warn;
|
|
||||||
use minijinja::Environment;
|
|
||||||
use warp::reject::Rejection;
|
|
||||||
use warp::reply::Reply;
|
|
||||||
use warp::reply::Response;
|
|
||||||
use warp::Filter;
|
|
||||||
|
|
||||||
use crate::challenge::ChallengeDesc;
|
|
||||||
use crate::config::Config;
|
|
||||||
use crate::vault::VaultRef;
|
|
||||||
|
|
||||||
use self::errors::handle_rejection;
|
|
||||||
|
|
||||||
pub mod admin;
|
|
||||||
pub mod errors;
|
|
||||||
pub mod user;
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct Service<'tp> {
|
|
||||||
config: Config,
|
|
||||||
env: Environment<'tp>,
|
|
||||||
challenges: Vec<(ChallengeDesc, VaultRef)>,
|
|
||||||
}
|
|
||||||
impl<'tp> Service<'tp> {
|
|
||||||
fn build(config: Config, challenges: Vec<(ChallengeDesc, VaultRef)>) -> Result<Arc<Self>> {
|
|
||||||
let mut env = Environment::new();
|
|
||||||
env.add_template(
|
|
||||||
"admin:index",
|
|
||||||
include_str!("../../data/www/admin/index.html"),
|
|
||||||
)?;
|
|
||||||
env.add_template(
|
|
||||||
"admin:details",
|
|
||||||
include_str!("../../data/www/admin/details.html"),
|
|
||||||
)?;
|
|
||||||
env.add_template("index", include_str!("../../data/www/index.html"))?;
|
|
||||||
env.add_template("details", include_str!("../../data/www/details.html"))?;
|
|
||||||
Ok(Self {
|
|
||||||
config,
|
|
||||||
env,
|
|
||||||
challenges,
|
|
||||||
}
|
|
||||||
.into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn serve(challenges: Vec<(ChallengeDesc, VaultRef)>, config: Config) -> Result<()> {
|
|
||||||
let service = Service::build(config, challenges)?;
|
|
||||||
|
|
||||||
let routes = Service::admin_routes(service.clone())
|
|
||||||
.or(Service::ressources_routes())
|
|
||||||
.or(Service::user_routes(service.clone()))
|
|
||||||
.recover(handle_rejection)
|
|
||||||
.with(warp::trace(|info| {
|
|
||||||
// Create a span using tracing macros
|
|
||||||
tracing::info_span!(
|
|
||||||
"admin",
|
|
||||||
method = %info.method(),
|
|
||||||
path = %info.path(),
|
|
||||||
)
|
|
||||||
}));
|
|
||||||
|
|
||||||
warp::serve(routes)
|
|
||||||
.run(service.config.addr_admin.unwrap())
|
|
||||||
.await;
|
|
||||||
|
|
||||||
warn!("exited the admin interface");
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Service<'_> {
|
|
||||||
fn ressources_routes() -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
|
|
||||||
warp::path("styles.css").and_then(styles)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn styles() -> Result<Box<dyn warp::Reply>, warp::Rejection> {
|
|
||||||
let r = Response::new(include_str!("../../data/www/styles.css").to_string().into());
|
|
||||||
Ok(Box::new(r))
|
|
||||||
}
|
|
||||||
100
src/meta/user.rs
100
src/meta/user.rs
|
|
@ -1,100 +0,0 @@
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use anyhow::Result;
|
|
||||||
use libpt::log::tracing;
|
|
||||||
use minijinja::context;
|
|
||||||
use warp::reject::Rejection;
|
|
||||||
use warp::reply::Reply;
|
|
||||||
use warp::reply::Response;
|
|
||||||
use warp::Filter;
|
|
||||||
|
|
||||||
use crate::challenge::ChallengeDesc;
|
|
||||||
use crate::vault::VaultRef;
|
|
||||||
|
|
||||||
use super::errors::TemplateError;
|
|
||||||
use super::Service;
|
|
||||||
|
|
||||||
fn with_serv(
|
|
||||||
serv: Arc<Service>,
|
|
||||||
) -> impl Filter<Extract = (Arc<Service>,), Error = std::convert::Infallible> + Clone {
|
|
||||||
warp::any().map(move || serv.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'tp> Service<'tp> {
|
|
||||||
pub fn user_routes(
|
|
||||||
this: Arc<Self>,
|
|
||||||
) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone + 'tp {
|
|
||||||
let serv = this.clone();
|
|
||||||
warp::path!("challenge" / usize)
|
|
||||||
.map(move |id: usize| serv.challenges[id - 1].clone())
|
|
||||||
.and(with_serv(this.clone()))
|
|
||||||
.and_then(details)
|
|
||||||
.with(warp::trace(|info| {
|
|
||||||
// Create a span using tracing macros
|
|
||||||
tracing::info_span!(
|
|
||||||
"admin",
|
|
||||||
method = %info.method(),
|
|
||||||
path = %info.path(),
|
|
||||||
)
|
|
||||||
}))
|
|
||||||
.or(warp::path::end().and(with_serv(this.clone()).and_then(index)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn details(
|
|
||||||
data: (ChallengeDesc, VaultRef),
|
|
||||||
serv: Arc<Service<'_>>,
|
|
||||||
) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
|
|
||||||
let challenge = data.0;
|
|
||||||
let vault = data.1;
|
|
||||||
let contestants = vault.contestants().await.into_iter().collect::<Vec<_>>();
|
|
||||||
let winners = vault.winners().await.into_iter().collect::<Vec<_>>();
|
|
||||||
let r = Response::new(
|
|
||||||
serv.env
|
|
||||||
.get_template("details")
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.render(context!(
|
|
||||||
title => "Wooly-Vault",
|
|
||||||
author => env!("CARGO_PKG_AUTHORS"),
|
|
||||||
year => "2024",
|
|
||||||
challenge_idx => challenge.id(),
|
|
||||||
challenge_title => challenge.title(),
|
|
||||||
challenge_description => challenge.description(),
|
|
||||||
challenge_hints => challenge.hints(),
|
|
||||||
// challenge_solution => challenge.solution(),
|
|
||||||
contestants => vault.contestants().await.iter().collect::<Vec<_>>(),
|
|
||||||
winners => vault.winners().await.iter().collect::<Vec<_>>(),
|
|
||||||
contestants => contestants,
|
|
||||||
winners => winners,
|
|
||||||
contestants_amount => contestants.len(),
|
|
||||||
winners_amount => winners.len(),
|
|
||||||
))
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(Box::new(r))
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn index(serv: Arc<Service<'_>>) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
|
|
||||||
let challenges = serv
|
|
||||||
.challenges
|
|
||||||
.iter()
|
|
||||||
.map(|v| v.0.to_owned())
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let r = Response::new(
|
|
||||||
serv.env
|
|
||||||
.get_template("admin:index")
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.render(context!(
|
|
||||||
title => "Wooly-Vault",
|
|
||||||
author => env!("CARGO_PKG_AUTHORS"),
|
|
||||||
year => "2024",
|
|
||||||
challenges => challenges,
|
|
||||||
challenges_amount => challenges.len(),
|
|
||||||
))
|
|
||||||
.map_err(TemplateError::from)?
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
Ok(Box::new(r))
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue