update

breadchris · breadchris · commit 0a0123b85402 · 2024-03-14T11:43:03.000-04:00
diff --git a/deploy/postgres.yaml b/deploy/postgres.yaml
@@ -86,4 +86,13 @@ spec:
   resources:
     requests:
       storage: 200Mi
-status: {}
+status: {}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgres-config
+data:
+  postgresql.conf: |
+    max_connections = 300
+    shared_buffers = 80MB
diff --git a/deploy/shell/shell.py b/deploy/shell/shell.py
@@ -109,8 +109,8 @@ def create_pod(name, password):
                             "cpu": "250m"
                         },
                         "limits": {
-                            "memory": "750Mi",
-                            "cpu": "750m"
+                            "memory": "500Mi",
+                            "cpu": "500m"
                         }
                     }
                 }
diff --git a/pkg/chals/chals.go b/pkg/chals/chals.go
@@ -370,15 +370,10 @@ func (s *Handler) Handle() (string, http.Handler) {
 									if t.Tracker.Password == password {
 										// TODO breadchris set message that user is logged in
 										sess.TrackerAuthed = true
-										sess.NextAttempt = time.Now()
 										s.manager.SetChalState(r.Context(), chalId, sess)
 									}
 								}
 							}
-							if !sess.TrackerAuthed {
-								sess.NextAttempt = time.Now().Add(1 * time.Minute)
-								s.manager.SetChalState(r.Context(), chalId, sess)
-							}
 						}
 						for _, app := range t.Phone.Apps {
 							app.Url, err = templChals(app.Url)
@@ -391,7 +386,6 @@ func (s *Handler) Handle() (string, http.Handler) {
 							Flag:          n.Meta.Flag,
 							TrackerLogin:  templ.URL(baseURL + "/tracker/login"),
 							TrackerAuthed: sess.TrackerAuthed,
-							NextAttempt:   sess.NextAttempt,
 						}, t.Phone)), templ.WithErrorHandler(func(r *http.Request, err error) http.Handler {
 							slog.Error("failed to template phone", "err", err)
 							return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/chals/tmpl/audioplayer.templ b/pkg/chals/tmpl/audioplayer.templ
@@ -28,13 +28,6 @@ script Player(songs []*chalgen.Song) {
     document.documentElement.classList.toggle('dark')
     });
 
-
-
-    document.getElementById('song-saved').addEventListener('click', function(){
-        document.getElementById('song-saved').classList.toggle('saved');
-    });
-
-
     Amplitude.init({
         "bindings": {
             37: 'prev',
@@ -1111,11 +1104,6 @@ div.amplitude-repeat-song.amplitude-repeat-song-on svg path{
             </div>
         </div>
         <div class="h-control-panel px-10 rounded-b-xl bg-control-panel-light-background border-t border-gray-200 flex items-center justify-between z-50 dark:bg-control-panel-dark-background dark:border-gray-900">
-            <div class="cursor-pointer" id="song-saved">
-                <svg width="26" height="24" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path d="M25 7C25 3.68629 22.2018 1 18.75 1C16.1692 1 13.9537 2.5017 13 4.64456C12.0463 2.5017 9.83082 1 7.25 1C3.79822 1 1 3.68629 1 7C1 14.6072 8.49219 20.1822 11.6365 22.187C12.4766 22.7226 13.5234 22.7226 14.3635 22.187C17.5078 20.1822 25 14.6072 25 7Z" stroke="#94A3B8" stroke-width="2" stroke-linejoin="round"/>
-                </svg>
-            </div>
             <div class="cursor-pointer amplitude-shuffle">
                 <svg width="28" height="26" viewBox="0 0 28 26" fill="none" xmlns="http://www.w3.org/2000/svg">
                     <path d="M1 20C0.447715 20 0 20.4477 0 21C0 21.5523 0.447715 22 1 22V20ZM7.75736 19.2426L8.46447 19.9497H8.46447L7.75736 19.2426ZM20.2426 6.75736L19.5355 6.05025L19.5355 6.05025L20.2426 6.75736ZM27 5L27.7071 5.70711C28.0976 5.31658 28.0976 4.68342 27.7071 4.29289L27 5ZM27 21L27.7071 21.7071C28.0976 21.3166 28.0976 20.6834 27.7071 20.2929L27 21ZM1 4C0.447715 4 0 4.44772 0 5C0 5.55228 0.447715 6 1 6V4ZM7.75736 6.75736L8.46447 6.05025L7.75736 6.75736ZM20.2426 19.2426L20.9497 18.5355L20.2426 19.2426ZM10.4645 10.8787C10.855 11.2692 11.4882 11.2692 11.8787 10.8787C12.2692 10.4882 12.2692 9.85499 11.8787 9.46447L10.4645 10.8787ZM17.5355 15.1213C17.145 14.7308 16.5118 14.7308 16.1213 15.1213C15.7308 15.5118 15.7308 16.145 16.1213 16.5355L17.5355 15.1213ZM23.7071 0.292893C23.3166 -0.0976311 22.6834 -0.0976311 22.2929 0.292893C21.9024 0.683417 21.9024 1.31658 22.2929 1.70711L23.7071 0.292893ZM22.2929 8.29289C21.9024 8.68342 21.9024 9.31658 22.2929 9.70711C22.6834 10.0976 23.3166 10.0976 23.7071 9.70711L22.2929 8.29289ZM23.7071 16.2929C23.3166 15.9024 22.6834 15.9024 22.2929 16.2929C21.9024 16.6834 21.9024 17.3166 22.2929 17.7071L23.7071 16.2929ZM22.2929 24.2929C21.9024 24.6834 21.9024 25.3166 22.2929 25.7071C22.6834 26.0976 23.3166 26.0976 23.7071 25.7071L22.2929 24.2929ZM1 22H3.51472V20H1V22ZM8.46447 19.9497L20.9497 7.46446L19.5355 6.05025L7.05025 18.5355L8.46447 19.9497ZM24.4853 6H27V4H24.4853V6ZM20.9497 7.46446C21.8874 6.52678 23.1592 6 24.4853 6V4C22.6288 4 20.8483 4.7375 19.5355 6.05025L20.9497 7.46446ZM3.51472 22C5.37123 22 7.15171 21.2625 8.46447 19.9497L7.05025 18.5355C6.11257 19.4732 4.8408 20 3.51472 20V22ZM27 20H24.4853V22H27V20ZM3.51472 4H1V6H3.51472V4ZM8.46447 6.05025C7.15171 4.7375 5.37123 4 3.51472 4V6C4.8408 6 6.11257 6.52678 7.05025 7.46446L8.46447 6.05025ZM24.4853 20C23.1592 20 21.8874 19.4732 20.9497 18.5355L19.5355 19.9497C20.8483 21.2625 22.6288 22 24.4853 22V20ZM11.8787 9.46447L8.46447 6.05025L7.05025 7.46446L10.4645 10.8787L11.8787 9.46447ZM20.9497 18.5355L17.5355 15.1213L16.1213 16.5355L19.5355 19.9497L20.9497 18.5355ZM22.2929 1.70711L26.2929 5.70711L27.7071 4.29289L23.7071 0.292893L22.2929 1.70711ZM26.2929 4.29289L22.2929 8.29289L23.7071 9.70711L27.7071 5.70711L26.2929 4.29289ZM22.2929 17.7071L26.2929 21.7071L27.7071 20.2929L23.7071 16.2929L22.2929 17.7071ZM26.2929 20.2929L22.2929 24.2929L23.7071 25.7071L27.7071 21.7071L26.2929 20.2929Z" fill="#94A3B8"/>
@@ -1148,14 +1136,6 @@ div.amplitude-repeat-song.amplitude-repeat-song-on svg path{
                     <path d="M17.7071 15.7071C18.0976 15.3166 18.0976 14.6834 17.7071 14.2929C17.3166 13.9024 16.6834 13.9024 16.2929 14.2929L17.7071 15.7071ZM13 19L12.2929 18.2929C11.9024 18.6834 11.9024 19.3166 12.2929 19.7071L13 19ZM16.2929 23.7071C16.6834 24.0976 17.3166 24.0976 17.7071 23.7071C18.0976 23.3166 18.0976 22.6834 17.7071 22.2929L16.2929 23.7071ZM19.9359 18.7035L19.8503 17.7072L19.9359 18.7035ZM8.95082 19.9005C9.50243 19.9277 9.97163 19.5025 9.99879 18.9509C10.026 18.3993 9.6008 17.9301 9.04918 17.9029L8.95082 19.9005ZM6.06408 18.7035L5.97851 19.6998L6.06408 18.7035ZM1.07501 13.4958L0.075929 13.5387L1.07501 13.4958ZM1.07501 6.50423L0.0759292 6.46127L1.07501 6.50423ZM6.06409 1.29649L6.14965 2.29282L6.06409 1.29649ZM19.9359 1.29649L19.8503 2.29283L19.9359 1.29649ZM24.925 6.50423L23.9259 6.54718L24.925 6.50423ZM24.925 13.4958L25.9241 13.5387V13.5387L24.925 13.4958ZM16.2929 14.2929L12.2929 18.2929L13.7071 19.7071L17.7071 15.7071L16.2929 14.2929ZM12.2929 19.7071L16.2929 23.7071L17.7071 22.2929L13.7071 18.2929L12.2929 19.7071ZM19.8503 17.7072C17.5929 17.901 15.3081 18 13 18V20C15.3653 20 17.7072 19.8986 20.0215 19.6998L19.8503 17.7072ZM9.04918 17.9029C8.07792 17.8551 7.1113 17.7898 6.14964 17.7072L5.97851 19.6998C6.96438 19.7845 7.95525 19.8515 8.95082 19.9005L9.04918 17.9029ZM2.07408 13.4528C2.02486 12.3081 2 11.157 2 10H0C0 11.1856 0.0254804 12.3654 0.075929 13.5387L2.07408 13.4528ZM2 10C2 8.84302 2.02486 7.69192 2.07408 6.54718L0.0759292 6.46127C0.0254806 7.63461 0 8.81436 0 10H2ZM6.14965 2.29282C8.4071 2.09896 10.6919 2 13 2V0C10.6347 0 8.29281 0.101411 5.97853 0.30016L6.14965 2.29282ZM13 2C15.3081 2 17.5929 2.09896 19.8503 2.29283L20.0215 0.30016C17.7072 0.101411 15.3653 0 13 0V2ZM23.9259 6.54718C23.9751 7.69192 24 8.84302 24 10H26C26 8.81436 25.9745 7.63461 25.9241 6.46127L23.9259 6.54718ZM24 10C24 11.157 23.9751 12.3081 23.9259 13.4528L25.9241 13.5387C25.9745 12.3654 26 11.1856 26 10H24ZM19.8503 2.29283C22.092 2.48534 23.8293 4.29889 23.9259 6.54718L25.9241 6.46127C25.7842 3.20897 23.2653 0.578736 20.0215 0.30016L19.8503 2.29283ZM6.14964 17.7072C3.90797 17.5147 2.17075 15.7011 2.07408 13.4528L0.075929 13.5387C0.215764 16.791 2.7347 19.4213 5.97851 19.6998L6.14964 17.7072ZM2.07408 6.54718C2.17075 4.29889 3.90798 2.48534 6.14965 2.29282L5.97853 0.30016C2.73471 0.578735 0.215764 3.20897 0.0759292 6.46127L2.07408 6.54718ZM20.0215 19.6998C23.2653 19.4213 25.7842 16.791 25.9241 13.5387L23.9259 13.4528C23.8292 15.7011 22.092 17.5147 19.8503 17.7072L20.0215 19.6998Z" fill="#94A3B8"/>
                 </svg>
             </div>
-            <div>
-                <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path d="M7.5 7H24.5V5H7.5V7ZM7.5 12H24.5V10H7.5V12ZM24.5 12C26.433 12 28 10.433 28 8.5H26C26 9.32843 25.3284 10 24.5 10V12ZM7.5 10C6.67157 10 6 9.32843 6 8.5H4C4 10.433 5.567 12 7.5 12V10ZM24.5 7C25.3284 7 26 7.67157 26 8.5H28C28 6.567 26.433 5 24.5 5V7ZM7.5 5C5.567 5 4 6.567 4 8.5H6C6 7.67157 6.67157 7 7.5 7V5Z" fill="#94A3B8"/>
-                    <path d="M5 15C4.44772 15 4 15.4477 4 16C4 16.5523 4.44772 17 5 17V15ZM27 17C27.5523 17 28 16.5523 28 16C28 15.4477 27.5523 15 27 15V17ZM5 17H27V15H5V17Z" fill="#94A3B8"/>
-                    <path d="M5 20C4.44772 20 4 20.4477 4 21C4 21.5523 4.44772 22 5 22V20ZM27 22C27.5523 22 28 21.5523 28 21C28 20.4477 27.5523 20 27 20V22ZM5 22H27V20H5V22Z" fill="#94A3B8"/>
-                    <path d="M5 25C4.44772 25 4 25.4477 4 26C4 26.5523 4.44772 27 5 27V25ZM27 27C27.5523 27 28 26.5523 28 26C28 25.4477 27.5523 25 27 25V27ZM5 27H27V25H5V27Z" fill="#94A3B8"/>
-                </svg>	
-            </div>
         </div>
         </div>
         </div>
diff --git a/pkg/chals/tmpl/audioplayer_templ.go b/pkg/chals/tmpl/audioplayer_templ.go
diff --git a/pkg/chals/tmpl/phone.templ b/pkg/chals/tmpl/phone.templ
@@ -50,17 +50,13 @@ templ App(state PhoneState, i int, a *chalgen.App) {
           </div>
         } else {
           <p>enter your fingerprint</p>
-          if state.NextAttempt.After(time.Now()) {
-            <p>next attempt in {fmt.Sprintf("%f", state.NextAttempt.Sub(time.Now()).Seconds())} seconds</p>
-          } else {
-              <form class="space-y-2" method="POST" action={state.TrackerLogin}>
-                  <label class="input input-bordered flex items-center gap-2">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4 opacity-70"><path fill-rule="evenodd" d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z" clip-rule="evenodd" /></svg>
-                    <input type="password" name="password" class="grow" />
-                  </label>
-                  <button type="submit" class="btn">login</button>
-              </form>
-          }
+          <form class="space-y-2" method="POST" action={state.TrackerLogin}>
+              <label class="input input-bordered flex items-center gap-2">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4 opacity-70"><path fill-rule="evenodd" d="M14 6a4 4 0 0 1-4.899 3.899l-1.955 1.955a.5.5 0 0 1-.353.146H5v1.5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2.293a.5.5 0 0 1 .146-.353l3.955-3.955A4 4 0 1 1 14 6Zm-4-2a.75.75 0 0 0 0 1.5.5.5 0 0 1 .5.5.75.75 0 0 0 1.5 0 2 2 0 0 0-2-2Z" clip-rule="evenodd" /></svg>
+                <input type="password" name="password" class="grow" />
+              </label>
+              <button type="submit" class="btn">login</button>
+          </form>
         }
       default:
         if a.Html != "" {
diff --git a/pkg/chals/tmpl/phone_templ.go b/pkg/chals/tmpl/phone_templ.go
diff --git a/pkg/models/homepage.go b/pkg/models/homepage.go
@@ -4,6 +4,6 @@ import "gorm.io/gorm"
 
 type HomePage struct {
 	gorm.Model
-	Id   string `gorm:"uniqueIndex"`
+	Id      string `gorm:"uniqueIndex"`
 	Content string
 }

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@ def create_pod(name, password):`
`109`	`109`	`"cpu": "250m"`
`110`	`110`	`},`
`111`	`111`	`"limits": {`
`112`		`- "memory": "750Mi",`
`113`		`- "cpu": "750m"`
	`112`	`+ "memory": "500Mi",`
	`113`	`+ "cpu": "500m"`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,15 +370,10 @@ func (s *Handler) Handle() (string, http.Handler) {`
`370`	`370`	`if t.Tracker.Password == password {`
`371`	`371`	`// TODO breadchris set message that user is logged in`
`372`	`372`	`sess.TrackerAuthed = true`
`373`		`- sess.NextAttempt = time.Now()`
`374`	`373`	`s.manager.SetChalState(r.Context(), chalId, sess)`
`375`	`374`	`}`
`376`	`375`	`}`
`377`	`376`	`}`
`378`		`- if !sess.TrackerAuthed {`
`379`		`- sess.NextAttempt = time.Now().Add(1 * time.Minute)`
`380`		`- s.manager.SetChalState(r.Context(), chalId, sess)`
`381`		`- }`
`382`	`377`	`}`
`383`	`378`	`for _, app := range t.Phone.Apps {`
`384`	`379`	`app.Url, err = templChals(app.Url)`
`@@ -391,7 +386,6 @@ func (s *Handler) Handle() (string, http.Handler) {`
`391`	`386`	`Flag: n.Meta.Flag,`
`392`	`387`	`TrackerLogin: templ.URL(baseURL + "/tracker/login"),`
`393`	`388`	`TrackerAuthed: sess.TrackerAuthed,`
`394`		`- NextAttempt: sess.NextAttempt,`
`395`	`389`	`}, t.Phone)), templ.WithErrorHandler(func(r *http.Request, err error) http.Handler {`
`396`	`390`	`slog.Error("failed to template phone", "err", err)`
`397`	`391`	`return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ import "gorm.io/gorm"`
`4`	`4`
`5`	`5`	`type HomePage struct {`
`6`	`6`	`gorm.Model`
`7`		- Id string `gorm:"uniqueIndex"`
	`7`	+ Id string `gorm:"uniqueIndex"`
`8`	`8`	`Content string`
`9`	`9`	`}`