Merge remote-tracking branch 'upstream/main'

Author: HappyLoLTroll

README.md

@@ -39,9 +39,12 @@ Using Luci's menu "System" --> "Attended Sysupgrade" it is now possible to selec
 
 <sub>Installing Custom Firmware</sub>  
 ![Installing Custom Firmware](attended-sysupgrade-installing.png)
-
+  
+<sub>GitHub repository</sub>  
+![GitHub repository used](attended-sysupgrade-server.png)
+  
 Notes:
-- if you fork this repository, this will be adapted to look for upgrades in your repository.
+- if you fork this repository, this will be adapted to look for upgrades in your repository by default.
 
 
 

attended-sysupgrade-server.png

@@ -13,16 +13,17 @@
  /**
   * Returns the branch of a given version. This helps to offer upgrades
   * for point releases (aka within the branch).
-@@ -694,7 +700,7 @@
+@@ -694,7 +700,8 @@
  		const data = {
  			system_board: promises[1],
  			advanced_mode: uci.get_first('attendedsysupgrade', 'client', 'advanced_mode') || 0,
 -			url: uci.get_first('attendedsysupgrade', 'server', 'url').replace(/\/+$/, ''),
 +			url: (uci.get_first('attendedsysupgrade', 'server', 'url') || '').replace(/\/+$/, ''),
++			github_repo: uci.get_first('attendedsysupgrade', 'server', 'github_repo') || 'XXXXXX/YYYYYY',
  			branch: get_branch(promises[1].release.version),
  			revision: promises[1].release.revision,
  			efi: promises[2],
-@@ -745,13 +751,218 @@
+@@ -745,13 +752,218 @@
  			E(
  				'button',
  				{
@@ -38,14 +39,15 @@
 +				'button',
 +				{
 +					class: 'btn cbi-button cbi-button-positive important',
-+					click: ui.createHandlerFn(this, this.handleGithubFirmware, firmware),
++					click: ui.createHandlerFn(this, this.handleGithubFirmware, data, firmware),
 +				},
 +				_('Check for GitHub firmware')
-+			),
-+		]);
-+	},
+ 			),
+ 		]);
+ 	},
 +
-+	handleGithubFirmware: function(firmware) {
++	handleGithubFirmware: function(data, firmware) {
++		const githubRepo = data.github_repo;
 +		ui.showModal(_('Fetching GitHub firmware info...'), [
 +			E(
 +				'p',
@@ -55,7 +57,7 @@
 +		]);
 +
 +		// Call the CGI script to get the list of available firmware releases
-+		fetch('/cgi-bin/github_check')
++		fetch('/cgi-bin/github_check?repo=' + encodeURIComponent(githubRepo))
 +			.then(response => response.json())
 +			.then(data => {
 +				if (data.error) {
@@ -95,7 +97,6 @@
 +
 +				// Create element for the URL
 +				const urlElement = E('td', { class: 'td left' });
-+
 +				// Function to update the URL based on selected release
 +				const updateDetails = function() {
 +					const selectedIndex = releaseSelect.value;
@@ -104,7 +105,7 @@
 +					if (selectedRelease) {
 +						// Clear previous link and create a new one
 +						urlElement.innerHTML = '';
-+						urlElement.appendChild(E('a', { href: 'https://github.com/XXXXXX/YYYYYY/releases/tag/' + selectedRelease.tag, target: '_blank' }, _('View on GitHub')));
++						urlElement.appendChild(E('a', { href: 'https://github.com/' + githubRepo + '/releases/tag/' + selectedRelease.tag, target: '_blank' }, _('View on GitHub')));
 +					}
 +				};
 +
@@ -146,7 +147,7 @@
 +									const selectedRelease = releases[selectedIndex];
 +
 +									if (selectedRelease && selectedRelease.tag) {
-+										this.handleGithubInstall(selectedRelease.tag, keep.checked);
++										this.handleGithubInstall(selectedRelease.tag, keep.checked, githubRepo);
 +									} else {
 +										ui.showModal(_('Error'), [
 +											E('p', _('Invalid release selected')),
@@ -177,18 +178,18 @@
 +			});
 +	},
 +
-+	handleGithubInstall: function(tag, keep) {
++	handleGithubInstall: function(tag, keep, githubRepo) {
 +		ui.showModal(_('Downloading from GitHub...'), [
 +			E(
 +				'p',
 +				{ class: 'spinning' },
 +				_('Downloading firmware from GitHub to device')
- 			),
- 		]);
++			),
++		]);
 +
 +		// Call the CGI script to download the firmware to /tmp/firmware.bin
 +		// Pass the selected tag as a parameter to the github_fetch script
-+		fetch(`/cgi-bin/github_fetch?tag=${encodeURIComponent(tag)}`)
++		fetch(`/cgi-bin/github_fetch?tag=${encodeURIComponent(tag)}&repo=${encodeURIComponent(githubRepo)}`)
 +			.then(response => response.json())
 +			.then(data => {
 +				if (data.error) {
@@ -238,8 +239,35 @@
 +					]),
 +				]);
 +			});
- 	},
++	},
 +
  	handleSaveApply: null,
  	handleSave: null,
  	handleReset: null,
+--- a/feeds/luci/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js
++++ b/feeds/luci/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/configuration.js
+@@ -32,6 +32,14 @@
+ 			)
+ 		);
+ 
++		o = s.option(
++			form.Value,
++			'github_repo',
++			_('GitHub Repository'),
++			_('GitHub repository for firmware releases (owner/name)')
++		);
++		o.placeholder = 'XXXXXX/YYYYYY';
++
+ 		s = m.section(form.TypedSection, 'client', _('Client'));
+ 		s.anonymous = true;
+ 
+--- a/feeds/packages/utils/attendedsysupgrade-common/files/attendedsysupgrade.defaults
++++ b/feeds/packages/utils/attendedsysupgrade-common/files/attendedsysupgrade.defaults
+@@ -7,6 +7,7 @@
+ uci -q batch <<EOF
+ set attendedsysupgrade.server=server
+ set attendedsysupgrade.server.url='https://sysupgrade.openwrt.org'
++set attendedsysupgrade.server.github_repo='XXXXXX/YYYYYY'
+ 
+ set attendedsysupgrade.client=client
+ set attendedsysupgrade.client.upgrade_packages='1'

attendedsysupgrade-with-GitHub.patch

@@ -4,11 +4,22 @@
 echo "Content-Type: application/json"
 echo ""
 
+QUERY_STRING="${QUERY_STRING:-$1}"
+REPO=$(printf '%s' "$QUERY_STRING" | sed -n 's/.*[?&]*repo=\([^&]*\).*/\1/p')
+# Decode percent-encoding
+REPO=$(printf '%b' "$(printf '%s' "$REPO" | sed 's/+/ /g;s/%/\\x/g')")
+
+# Validate repo format (owner/name, alphanumeric with hyphens/underscores/dots)
+if ! printf '%s' "$REPO" | grep -qE '^[A-Za-z0-9._-]+/[A-Za-z0-9._-]+$'; then
+  printf '{"error":"missing or invalid repo parameter"}'
+  exit 1
+fi
+
 # Create a temporary file for the final JSON objects
 temp_json="/tmp/github_versions_$$.tmp"
 > "$temp_json"  # Clear the file
 
-curl -sS https://api.github.com/repos/XXXXXX/YYYYYY/releases | \
+curl -sS "https://api.github.com/repos/$REPO/releases" | \
 jq -r '.[] | "\(.tag_name) \(.assets[] | select(.browser_download_url | contains("sysupgrade")) | .browser_download_url)"' | \
 while read -r tag url; do
     if [ -z "$url" ] || [ -z "$tag" ]; then

files/etc/uci-defaults/999-QOL_config files/etc/uci-defaults/99_QOL_configfiles/etc/uci-defaults/999-QOL_config renamed to files/etc/uci-defaults/99_QOL_config

@@ -9,18 +9,27 @@ QUERY_STRING="${QUERY_STRING:-$1}"
 # Extract tag parameter (simple URL-decode of %XX sequences and +->space not needed here)
 # Use parameter expansion and sed to get tag value if present, otherwise use whole string
 TAG=$(printf '%s' "$QUERY_STRING" | sed -n 's/.*[?&]*tag=\([^&]*\).*/\1/p')
-[ -z "$TAG" ] && TAG="$QUERY_STRING"
 # Decode percent-encoding (handles %2B, %2F, etc.)
 TAG=$(printf '%b' "$(printf '%s' "$TAG" | sed 's/+/ /g;s/%/\\x/g')")
 
+# Extract repo parameter
+REPO=$(printf '%s' "$QUERY_STRING" | sed -n 's/.*[?&]*repo=\([^&]*\).*/\1/p')
+REPO=$(printf '%b' "$(printf '%s' "$REPO" | sed 's/+/ /g;s/%/\\x/g')")
+
+# Validate repo format (owner/name, alphanumeric with hyphens/underscores/dots)
+if ! printf '%s' "$REPO" | grep -qE '^[A-Za-z0-9._-]+/[A-Za-z0-9._-]+$'; then
+  printf '{"error":"missing or invalid repo parameter"}'
+  exit 1
+fi
+
 # basic validation
 if [ -z "$TAG" ]; then
   printf '{"error":"missing tag"}'
   exit 1
 fi
 
 # Fetch release metadata once
-RELEASE_JSON=$(curl -sS "https://api.github.com/repos/XXXXXX/YYYYYY/releases/tags/$TAG") || {
+RELEASE_JSON=$(curl -sS "https://api.github.com/repos/$REPO/releases/tags/$TAG") || {
   printf '{"error":"failed to fetch release metadata"}'
   exit 1
 }
@@ -36,7 +45,7 @@ FILENAME=$(basename "$URL")
 # Try: 1) sha256sums asset file, 2) asset .digest field (sha256:)
 SHA256_URL=$(printf '%s' "$RELEASE_JSON" | jq -r '.assets[] | select(.browser_download_url|contains("sha256sums")) | .browser_download_url // empty' | head -n1)
 # download sha256sums and extract matching line
-[ -n "$SHA256_URL" ] && SHA256=$(curl -sSL "$SHA256_URL" | sed -n "s|\([0-9a-fA-F]*\).*${FILENAME}|\1|p")
+[ -n "$SHA256_URL" ] && SHA256=$(curl -sSL "$SHA256_URL" | sed -n "s|\([0-9a-fA-F]*\).*${FILENAME}.*|\1|p")
 # fallback to metadata if present
 [ -z "$SHA256" ] && SHA256=$(printf '%s' "$RELEASE_JSON" | jq -r '.assets[] | select(.browser_download_url|contains("sysupgrade")) | .digest // empty' | sed -n 's/^sha256://p' | head -n1)
 

files/www/cgi-bin/github_check

@@ -172,6 +172,10 @@ CONFIG_PACKAGE_libip4tc=y
 CONFIG_PACKAGE_libip6tc=y
 
 
+## Base options
+CONFIG_PACKAGE_attendedsysupgrade-common=y
+CONFIG_PACKAGE_luci-app-attendedsysupgrade=y
+
 ## Compiler and Toolchain Optimization
 CONFIG_TARGET_OPTIMIZATION="-O2 -pipe -mcpu=cortex-a53+crc+crypto"
 CONFIG_USE_GC_SECTIONS=y