make things look nicer and work on image change

README.md

@@ -13,7 +13,7 @@ A simple, lightweight web application for managing user profile photos in a Free
 ## Prerequisites
 *   **Go 1.26+** installed on your machine.
 *   Access to a **FreeIPA Server**.
-*   A Service Account with permission to search and modify the `jpegPhoto` attribute.
+*   A Service Account with permission to search and modify the `jpegPhoto` attribute and read the `krbPasswordExpiration` attribute.
 
 ## Setup & Installation
 

src/pages/profile_page.html

@@ -10,6 +10,7 @@
 <link rel="stylesheet" href="static/error/error.css" />
 <link rel="stylesheet" href="static/profile_page.css" />
 <link rel="stylesheet" href="static/progress_bar.css" />
+<link rel="stylesheet" href="static/cursor.css" />
 
 <div id="popup_background" class="blocked hidden"></div>
 
@@ -87,23 +88,51 @@
             ></div>
         </div>
     </div>
-
-    <!--<div id="password_errors">
-        <div class="password_error">Error 1</div>
-        <div class="password_error">Error 2</div>
-    </div>
-
-    <div id="password_warnings">
-        <div class="password_error">Error 1</div>
-        <div class="password_error">Error 2</div>
-    </div>-->
-
     <button id="final_change_password_button">Change Password</button>
 </div>
 
-<div id="resize_photo_dialouge" class="card static_center hidden">
-    <div id="resize_photo_box"></div>
-    <img id="new_profile_image" alt="new-profile-image" />
+<div
+    id="resize_photo_dialouge"
+    class="card static_center hidden"
+    draggable="false"
+>
+    <div id="image_container" draggable="false">
+        <img
+            id="new_profile_image"
+            alt="new-profile-image"
+            class="noselect"
+            draggable="false"
+        />
+        <div id="image_dark_overlay" draggable="false"></div>
+    </div>
+    <div id="grab-area" draggable="false">
+        <div id="box-scale-holder">
+            <div
+                draggable="false"
+                id="top_left_resize"
+                class="resize_anchor"
+            ></div>
+            <div
+                draggable="false"
+                id="top_right_resize"
+                class="resize_anchor"
+            ></div>
+            <div
+                draggable="false"
+                id="bottom_left_resize"
+                class="resize_anchor"
+            ></div>
+            <div
+                draggable="false"
+                id="bottom_right_resize"
+                class="resize_anchor"
+            ></div>
+        </div>
+        <div id="resize_photo_box" draggable="false">
+            <div id="circle-display"></div>
+        </div>
+    </div>
+    <button id="confirm_change" draggable="false">Confirm Change</button>
 </div>
 
 <img id="logo_image" alt="logo" src="/logo" />
@@ -173,26 +202,44 @@
     </div>
 </div>
 
+<script src="/static/javascript/helpers.js" type="text/javascript"></script>
+<script src="/static/javascript/cursor.js" type="text/javascript"></script>
+<script
+    src="/static/javascript/resize_photo_dialouge.js"
+    type="text/javascript"
+></script>
+
 <script type="text/javascript">
     const button = document.getElementById("edit_picture_button");
     const fileInput = document.getElementById("file_input");
+    const confirm_change = document.getElementById("confirm_change");
+    const new_profile_image = document.getElementById("new_profile_image");
 
     button.addEventListener("click", () => {
-        fileInput.click(); // opens file picker
+        fileInput.click();
     });
 </script>
 
 <script type="text/javascript">
-    var currentPreviewURL = null;
+    var currentPreviewURL = null,
+        image = null,
+        file = null;
+
+    var x_start = 0,
+        y_start = 0;
+
+    var image_width = 0,
+        image_height = 0;
 
     fileInput.addEventListener("change", async () => {
         document.getElementById("popup_background").classList.remove("hidden");
 
-        const file = fileInput.files[0];
+        file = fileInput.files[0];
         if (!file) return;
         if (file.type !== "image/jpeg") {
             alert("Only JPEG images are allowed.");
             fileInput.value = "";
+            document.getElementById("popup_background").classList.add("hidden");
             return;
         }
 
@@ -200,19 +247,52 @@
             .getElementById("resize_photo_dialouge")
             .classList.remove("hidden");
 
-        var image = URL.createObjectURL(file);
-        const bitmap = await createImageBitmap(file);
+        image = URL.createObjectURL(file);
+        var bitmap = await createImageBitmap(file);
 
-        var new_profile_image = document.getElementById("new_profile_image");
         new_profile_image.src = image;
-        var resize_photo_box = document.getElementById("resize_photo_box");
 
-        resize_photo_box.style.setProperty("--img-width", bitmap.width + "px");
-        resize_photo_box.style.setProperty(
-            "--img-height",
-            bitmap.height + "px",
+        new_profile_image.style.setProperty("--x-offset", "0px");
+        new_profile_image.style.setProperty("--y-offset", "0px");
+
+        smaller_dimension = min(bitmap.width, bitmap.height);
+        diff_to_350 = 360 / smaller_dimension;
+
+        image_width = bitmap.width * diff_to_350;
+        image_height = bitmap.height * diff_to_350;
+
+        new_profile_image.style.setProperty("--x-size", image_width + "px");
+        new_profile_image.style.setProperty("--y-size", image_height + "px");
+
+        image_dark_overlay.style.setProperty("--x-size", image_width + "px");
+        image_dark_overlay.style.setProperty("--y-size", image_height + "px");
+
+        image_dark_overlay.style.setProperty("--x-offset", "0px");
+        image_dark_overlay.style.setProperty("--y-offset", "0px");
+
+        bounds = calculateBoxBoundsOnImage({
+            x: 0,
+            y: 0,
+        });
+        image_dark_overlay.style.setProperty("--left-edge", bounds.left + "px");
+        image_dark_overlay.style.setProperty(
+            "--right-edge",
+            bounds.right + "px",
         );
-        return;
+
+        image_dark_overlay.style.setProperty("--top-edge", bounds.top + "px");
+        image_dark_overlay.style.setProperty(
+            "--bottom-edge",
+            bounds.bottom + "px",
+        );
+
+        resize_photo_box.style.setProperty("--size", "350px");
+    });
+
+    confirm_change.addEventListener("click", async () => {
+        document
+            .getElementById("resize_photo_dialouge")
+            .classList.add("hidden");
 
         const formData = new FormData();
         formData.append("photo", file);

src/session/session_manager.go

@@ -38,10 +38,6 @@ func (manager *SessionManager) SetStoreType(storeType StoreType, params ...any)
 	case InMemory:
 		{
 			manager.store = store.NewMemoryStore[*SessionData]()
-			// worker.CreateWorker(time.Minute*5, func() {
-			// 	inMemStore, _ := manager.store.(*store.MemoryStore[*SessionData])
-			// 	cleanupInMemoryStore(inMemStore)
-			// })
 			break
 		}
 	case Redis:
@@ -109,23 +105,6 @@ func (manager *SessionManager) GetSession(r *http.Request) (*SessionData, error)
 	return data, nil
 }
 
-// func cleanupInMemoryStore(m *store.MemoryStore[*SessionData]) {
-// 	logging.Debug("Cleaning up memory store sessions")
-// 	now := time.Now()
-
-// 	m.Lock.Lock()
-// 	defer m.Lock.Unlock()
-
-// 	deleted := 0
-// 	for id, session := range m.Sessions {
-// 		if now.After(session.ExpiresAt) {
-// 			delete(m.Sessions, id)
-// 			deleted = deleted + 1
-// 		}
-// 	}
-// 	logging.Infof("Cleaned up %d stale sessions", deleted)
-// }
-
 func (manager *SessionManager) DeleteSession(sessionId string) error {
 	return manager.store.Delete(sessionId)
 }

src/store/store_in_memory.go

@@ -5,58 +5,122 @@ import (
 	"time"
 
 	"astraltech.xyz/accountmanager/src/logging"
+	"astraltech.xyz/accountmanager/src/worker"
 )
 
-type ValueEntry[Value any] struct {
+type KeyValue[Value any] struct {
 	value      Value
-	expiry time.Time
+	expireTime time.Time
+}
+
+type ExpireTime struct {
+	expiryTime time.Time
+	key        string
 }
 
 type MemoryStore[Value any] struct {
-	Keys map[string]ValueEntry[Value]
-
+	Keys        map[string]KeyValue[Value]
 	Lock        sync.RWMutex
+	ExpireTimes []ExpireTime
 }
 
 func NewMemoryStore[Value any]() *MemoryStore[Value] {
 	logging.Debug("Creating new in memory session store")
 	store := &MemoryStore[Value]{
-		Keys: make(map[string]ValueEntry[Value]),
+		Keys:        make(map[string]KeyValue[Value]),
+		Lock:        sync.RWMutex{},
+		ExpireTimes: []ExpireTime{},
 	}
+	worker.CreateWorker(time.Minute*5, store.CleanupExpired)
 	return store
 }
 
 func (m *MemoryStore[Value]) CreateExpiring(key string, value Value, duration time.Duration) error {
-	hashedkey := HashKey(key)
+	var expiry time.Time
+	if duration != 0 {
+		expiry = time.Now().Add(duration)
+	}
 
 	m.Lock.Lock()
 	defer m.Lock.Unlock()
+
+	hashedkey := HashKey(key)
 	_, exist := m.Keys[hashedkey]
 	if exist {
 		return ErrKeyAlreadyExists
 	}
 
-	m.Keys[hashedkey] = ValueEntry[Value]{
+	m.Keys[hashedkey] = KeyValue[Value]{
 		value:      value,
-		expiry: time.Now().Add(duration),
+		expireTime: expiry,
 	}
+
+	if duration != 0 {
+		low := 0
+		high := len(m.ExpireTimes)
+
+		for low < high {
+			mid := (low + high) / 2
+
+			if m.ExpireTimes[mid].expiryTime.Before(expiry) {
+				low = mid + 1
+			} else {
+				high = mid
+			}
+		}
+		insertIndex := low
+
+		m.ExpireTimes = append(m.ExpireTimes, ExpireTime{})
+		copy(m.ExpireTimes[insertIndex+1:], m.ExpireTimes[insertIndex:])
+		m.ExpireTimes[insertIndex] = ExpireTime{
+			key:        key,
+			expiryTime: expiry,
+		}
+	}
+
 	return nil
 }
 
+func (m *MemoryStore[Value]) CleanupExpired() {
+	m.Lock.Lock()
+	defer m.Lock.Unlock()
+
+	now := time.Now()
+	for len(m.ExpireTimes) > 0 && !now.Before(m.ExpireTimes[0].expiryTime) {
+		key, exists := m.Keys[HashKey(m.ExpireTimes[0].key)]
+		if exists && key.expireTime.Equal(m.ExpireTimes[0].expiryTime) {
+			m.deleteWithoutLock(m.ExpireTimes[0].key)
+		}
+		m.ExpireTimes = m.ExpireTimes[1:]
+	}
+}
+
 func (m *MemoryStore[Value]) Create(key string, session Value) error {
 	return m.CreateExpiring(key, session, 0)
 }
 
 func (m *MemoryStore[Value]) Get(key string) (Value, error) {
-	var data ValueEntry[Value]
+	var data KeyValue[Value]
+	var zeroValue Value
+	hashedkey := HashKey(key)
 
 	m.Lock.RLock()
-	hashedkey := HashKey(key)
 	data, exists := m.Keys[hashedkey]
 	m.Lock.RUnlock()
-	if exists == false {
-		return data.value, ErrKeyNotFound
+
+	if !exists {
+		return zeroValue, ErrKeyNotFound
 	}
+
+	if !data.expireTime.IsZero() && !time.Now().Before(data.expireTime) {
+		m.Lock.Lock()
+		if current, ok := m.Keys[hashedkey]; ok && current.expireTime.Equal(data.expireTime) {
+			delete(m.Keys, hashedkey)
+		}
+		m.Lock.Unlock()
+		return zeroValue, ErrKeyNotFound
+	}
+
 	return data.value, nil
 }
 
@@ -65,22 +129,20 @@ func (m *MemoryStore[Value]) Update(sessionID string, value Value) error {
 
 	m.Lock.Lock()
 	defer m.Lock.Unlock()
-	current_key, exist := m.Keys[hashedkey]
+	old_key, exist := m.Keys[hashedkey]
 	if !exist {
 		return ErrKeyNotFound
 	}
-	m.Keys[hashedkey] = ValueEntry[Value]{
+	m.Keys[hashedkey] = KeyValue[Value]{
 		value:      value,
-		expiry: current_key.expiry,
+		expireTime: old_key.expireTime,
 	}
 	return nil
 }
 
-func (m *MemoryStore[Value]) Delete(sessionID string) error {
-	hashedkey := HashKey(sessionID)
+func (m *MemoryStore[Value]) deleteWithoutLock(key string) error {
+	hashedkey := HashKey(key)
 
-	m.Lock.Lock()
-	defer m.Lock.Unlock()
 	_, exist := m.Keys[hashedkey]
 	if !exist {
 		return ErrKeyNotFound
@@ -88,3 +150,9 @@ func (m *MemoryStore[Value]) Delete(sessionID string) error {
 	delete(m.Keys, hashedkey)
 	return nil
 }
+
+func (m *MemoryStore[Value]) Delete(key string) error {
+	m.Lock.Lock()
+	defer m.Lock.Unlock()
+	return m.deleteWithoutLock(key)
+}

static/card.css

@@ -9,6 +9,7 @@
     display: flex;
     flex-direction: column;
     gap: 15px;
+    overflow: hidden;
 }
 
 .static_center {

static/cursor.css

@@ -0,0 +1,3 @@
+.cursor_grabbing {
+    cursor: grabbing;
+}

static/javascript/cursor.js

@@ -0,0 +1,20 @@
+var currentX, currentY;
+
+document.addEventListener("mousemove", (e) => {
+  const rect = document.body.getBoundingClientRect();
+
+  currentX = e.clientX;
+  currentY = e.clientY;
+});
+
+const CURSOR_NORMAL = "cursor_normal";
+const CURSOR_GRABBING = "cursor_grabbing";
+
+document.body.classList.remove(CURSOR_NORMAL);
+
+let current_cursor_state = CURSOR_NORMAL;
+function set_cursor_state(new_cursor_state) {
+  document.body.classList.remove(current_cursor_state);
+  document.body.classList.add(new_cursor_state);
+  current_cursor_state = new_cursor_state;
+}

static/javascript/helpers.js

@@ -0,0 +1,13 @@
+function min(a, b) {
+  if (a < b) {
+    return a;
+  }
+  return b;
+}
+
+function max(a, b) {
+  if (a > b) {
+    return a;
+  }
+  return b;
+}

static/javascript/resize_photo_dialouge.js

@@ -0,0 +1,134 @@
+const resize_photo_box = document.getElementById("resize_photo_box");
+const image_dark_overlay = document.getElementById("image_dark_overlay");
+
+// Drag handling
+var startXOffset = 0,
+  startYOffset = 0;
+
+function calculateOffsets() {
+  const yOffset = startYOffset + (currentY - y_start);
+  const xOffset = startXOffset + (currentX - x_start);
+
+  var top = image_height / 2 - yOffset - 175 - 5;
+  if (top > 0) top = 0;
+
+  var bottom = -(image_height / 2) - yOffset + 5 + 175;
+  if (bottom < 0) bottom = 0;
+
+  var left = image_width / 2 - xOffset - 175 - 5;
+  if (left > 0) left = 0;
+
+  var right = -(image_width / 2) - xOffset + 5 + 175;
+  if (right < 0) right = 0;
+  return { x: xOffset + left + right, y: yOffset + top + bottom };
+}
+
+function calculateBoxBoundsOnImage(offsets) {
+  const x_overspill = image_width - 360;
+  const left_overspill = x_overspill / 2 - offsets.x;
+
+  const y_overspill = image_height - 360;
+  const top_overspill = y_overspill / 2 - offsets.y;
+
+  return {
+    left: left_overspill,
+    right: left_overspill + 360,
+    top: top_overspill,
+    bottom: top_overspill + 360,
+  };
+}
+
+var mouseClicked = false;
+resize_photo_box.addEventListener("mousemove", () => {
+  if (!mouseClicked) return;
+
+  offsets = calculateOffsets();
+
+  new_profile_image.style.setProperty("--x-offset", offsets.x + "px");
+  new_profile_image.style.setProperty("--y-offset", offsets.y + "px");
+
+  image_dark_overlay.style.setProperty("--x-offset", offsets.x + "px");
+  image_dark_overlay.style.setProperty("--y-offset", offsets.y + "px");
+
+  bounds = calculateBoxBoundsOnImage(offsets);
+  image_dark_overlay.style.setProperty("--left-edge", bounds.left + "px");
+  image_dark_overlay.style.setProperty("--right-edge", bounds.right + "px");
+
+  image_dark_overlay.style.setProperty("--top-edge", bounds.top + "px");
+  image_dark_overlay.style.setProperty("--bottom-edge", bounds.bottom + "px");
+});
+
+resize_photo_box.addEventListener("mousedown", () => {
+  x_start = currentX;
+  y_start = currentY;
+  mouseClicked = true;
+  set_cursor_state(CURSOR_GRABBING);
+});
+
+let unclickedMouse = false;
+resize_photo_box.addEventListener("mouseup", () => {
+  if (!unclickedMouse) return;
+  unclickedMouse = false;
+  offsets = calculateOffsets();
+
+  startXOffset = offsets.x;
+  startYOffset = offsets.y;
+});
+
+document.body.addEventListener("mouseup", () => {
+  if (mouseClicked) unclickedMouse = true;
+  mouseClicked = false;
+  set_cursor_state(CURSOR_NORMAL);
+});
+
+// handle anchors
+resize_anchors = document.getElementsByClassName("resize_anchor");
+var handleBeingHeld = [false, false, false, false];
+var startX, startY;
+for (var i = 0; i < resize_anchors.length; i++) {
+  const index = i;
+  resize_anchors[index].addEventListener("mousedown", (e) => {
+    e.stopPropagation();
+    handleBeingHeld[index] = true;
+    startX = currentX;
+    startY = currentY;
+  });
+
+  document.body.addEventListener("mouseup", () => {
+    handleBeingHeld[index] = false;
+    resize_anchors[index].style.setProperty("--x-offset", "0px");
+    resize_anchors[index].style.setProperty("--y-offset", "0px");
+    resize_photo_box.style.setProperty("--size", "350px");
+    resize_photo_box.style.setProperty("--box-x-offset", "0px");
+    resize_photo_box.style.setProperty("--box-y-offset", "0px");
+  });
+
+  resize_anchors[i].style.setProperty("--x-offset", "0px");
+  resize_anchors[i].style.setProperty("--y-offset", "0px");
+}
+
+document.body.addEventListener("mousemove", () => {
+  for (var i = 0; i < handleBeingHeld.length; i++) {
+    if (!handleBeingHeld[i]) continue;
+
+    newX = Math.abs(startX - currentX);
+    newY = Math.abs(currentY - startY);
+
+    moveAmount = max(min(newX, newY), 0);
+
+    resize_anchors[i].style.setProperty("--x-offset", moveAmount + "px");
+    resize_anchors[i].style.setProperty("--y-offset", moveAmount + "px");
+    resize_photo_box.style.setProperty("--size", 350 - moveAmount + "px");
+
+    if (i == 0) {
+      resize_photo_box.style.setProperty("--box-x-offset", moveAmount + "px");
+      resize_photo_box.style.setProperty("--box-y-offset", moveAmount + "px");
+    }
+    if (i == 1) {
+      resize_photo_box.style.setProperty("--box-y-offset", moveAmount + "px");
+    }
+    if (i == 2) {
+      resize_photo_box.style.setProperty("--box-x-offset", moveAmount + "px");
+    }
+  }
+});

static/profile_page.css

@@ -154,28 +154,143 @@
     color: var(--text-main);
 }
 
-#resize_photo_box {
-    background-color: black;
+#image_container {
     position: absolute;
-    opacity: 40%;
-    width: var(--img-width);
-    height: var(--img-height);
+    display: inline-block;
+}
 
-    --percent: 0.5;
-    --smalled-dim: min(var(--img-width), var(--img-height));
+#darken_part {
+    /*background-color: black;*/
+    z-index: 3;
+    width: 100vw;
+    height: 100vh;
+}
 
-    --smaller-pixel: calc((0.5 - (var(--percent)) / 2) * var(--smalled-dim));
-    --larger-pixel: calc((0.5 + (var(--percent)) / 2) * var(--smalled-dim));
+#confirm_change {
+    z-index: 2;
+}
+
+#new_profile_image {
+    z-index: 1;
+    transform: translateX(calc(-50% + var(--x-offset) + 5px))
+        translateY(calc(-50% + var(--y-offset) + 5px));
+    position: absolute;
+    left: calc(350px / 2);
+    top: calc(350px / 2);
+    width: var(--x-size);
+    height: var(--y-size);
+    image-rendering: pixelated;
+}
+
+#grab-area {
+    display: grid;
+}
+
+#grab-area > * {
+    grid-column-start: 1;
+    grid-row-start: 1;
+}
+
+#resize_photo_box {
+    background-color: rgba(0, 0, 0, 0);
+    width: var(--size);
+    aspect-ratio: 1 / 1;
+
+    border-style: dashed;
+    border-color: black;
+    border-width: 5px;
+    z-index: 4;
+
+    transform: translateX(var(--box-x-offset)) translateY(var(--box-y-offset));
+}
+
+.resize_anchor {
+    background-color: red;
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    z-index: 5;
+}
+
+#top_left_resize {
+    transform: translateX(calc(-50% + var(--x-offset) + 10px))
+        translateY(calc(-50% + var(--y-offset) + 10px));
+}
+
+#top_left_resize:hover {
+    cursor: nw-resize !important;
+}
+
+#top_right_resize {
+    transform: translateX(calc(350px - var(--x-offset) - 10px))
+        translateY(calc(-50% + var(--y-offset) + 10px));
+}
+
+#top_right_resize:hover {
+    cursor: ne-resize !important;
+}
+
+#bottom_left_resize {
+    transform: translateX(calc(-50% + var(--x-offset) + 10px))
+        translateY(calc(340px - var(--x-offset)));
+}
+
+#bottom_left_resize:hover {
+    cursor: sw-resize !important;
+}
+
+#bottom_right_resize {
+    transform: translateX(calc(340px - var(--x-offset)))
+        translateY(calc(340px - var(--y-offset)));
+}
+
+#bottom_right_resize:hover {
+    cursor: se-resize !important;
+}
+
+#box-scale-holder {
+    position: relative;
+    width: 360px;
+    height: 360px;
+}
+
+#circle-display {
+    position: absolute;
+    width: calc(100% + 10px);
+    height: calc(100% + 10px);
+    transform: translateX(-5px) translateY(-5px);
+    transform: scale(10px);
+    background: radial-gradient(
+        circle closest-side,
+        transparent 99%,
+        rgba(0, 0, 0, 0.5) 100%
+    );
+    /*dispalt*/
+}
+
+#image_dark_overlay {
+    background-color: rgba(0, 0, 0, 0.5);
+    pointer-events: none;
+
+    z-index: 2;
+
+    transform: translateX(calc(-50% + var(--x-offset) + 5px))
+        translateY(calc(-50% + var(--y-offset) + 5px));
+    position: absolute;
+    left: calc(350px / 2);
+    top: calc(350px / 2);
+    width: var(--x-size);
+    height: var(--y-size);
 
     clip-path: polygon(
         0% 0%,
         0% 100%,
-        var(--smaller-pixel) 100%,
-        var(--smaller-pixel) var(--smaller-pixel),
-        var(--larger-pixel) var(--smaller-pixel),
-        var(--larger-pixel) var(--larger-pixel),
-        var(--smaller-pixel) var(--larger-pixel),
-        var(--smaller-pixel) 100%,
+        var(--left-edge) 100%,
+        var(--left-edge) var(--top-edge),
+        var(--right-edge) var(--top-edge),
+        var(--right-edge) var(--bottom-edge),
+        var(--left-edge) var(--bottom-edge),
+        var(--left-edge) 100%,
         100% 100%,
         100% 0%
     );

static/style.css

@@ -140,3 +140,12 @@ input::placeholder {
 .subtext {
     color: var(--text-muted);
 }
+
+.noselect {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}