fix redirect to auth provider on public add new link

oidc/plugin.php

@@ -3,15 +3,14 @@
 Plugin Name: oidc
 Plugin URI: https://github.com/joshp23/YOURLS-OIDC
 Description: Enables OpenID Connect user authentication
-Version: 0.2.0
+Version: 0.2.1
 Author: Josh Panter
 Author URI: https://unfettered.net
 */
 // No direct call
 if( !defined( 'YOURLS_ABSPATH' ) ) die();
 
 require_once __DIR__.'/vendor/autoload.php';
-
 global $oidc;
 $oidc = new Jumbojett\OpenIDConnectClient(
 			OIDC_BASE_URL,
@@ -20,27 +19,22 @@
 		);
 
 yourls_add_filter( 'is_valid_user', 'oidc_auth' );
-function oidc_auth($valid) {
+function oidc_auth( $valid ) {
 	// check for correct context
-	if ( !yourls_is_API()  && !$valid ) {
+	if ( !yourls_is_API() && !$valid ) {
 		global $oidc;
 		$oidc->authenticate();
-		$user_id = $oidc->requestUserInfo('sub');
-		$pref_uname = $oidc->requestUserInfo('preferred_username');
-		if ($user_id) {	
-			$valid = true;
-			$id = $user_id;
-			global $yourls_user_passwords;
+		$id = $oidc->requestUserInfo('sub');
+		if ( $id ) {
 			global $oidc_profiles;
-			foreach( $oidc_profiles as $local_user => $local_hash) {
-				if( $user_id == $local_hash )
-					$id = $local_user;
+			foreach( $oidc_profiles as $user => $hash) {
+				if( $id == $hash ) {
+					yourls_set_user($user);
+					$valid = true;
+				}
 			}
-			$valid = true;
-			yourls_set_user($id);
 		}
 	}
-	// return appropriate validation status
 	return $valid;
 }
 
@@ -50,4 +44,58 @@ function oidc_logout() {
 	global $oidc;
 	$oidc->signOut( null, YOURLS_SITE );
 }
+
+// Largely unchanged: only checking auth against w/ cookies.
+yourls_add_filter( 'shunt_check_IP_flood', 'oidc_check_ip_flood' );
+function oidc_check_ip_flood ( $ip ) {
+	// don't touch API logic
+	if ( yourls_is_API() ) return false;
+
+	yourls_do_action( 'pre_check_ip_flood', $ip ); // at this point $ip can be '', check it if your plugin hooks in here
+
+	// Raise white flag if installing or if no flood delay defined
+	if(
+		( defined('YOURLS_FLOOD_DELAY_SECONDS') && YOURLS_FLOOD_DELAY_SECONDS === 0 ) ||
+		!defined('YOURLS_FLOOD_DELAY_SECONDS') ||
+		yourls_is_installing()
+	)
+		return true;
+
+	// Don't throttle logged in users XXX and don't trigger OIDC login!
+	if( yourls_is_private() && isset( $_COOKIE[ yourls_cookie_name() ] ) && yourls_check_auth_cookie() ) {
+		yourls_store_cookie( YOURLS_USER );
+		return true;
+	}
+
+	// Don't throttle whitelist IPs
+	if( defined( 'YOURLS_FLOOD_IP_WHITELIST' ) && YOURLS_FLOOD_IP_WHITELIST ) {
+		$whitelist_ips = explode( ',', YOURLS_FLOOD_IP_WHITELIST );
+		foreach( (array)$whitelist_ips as $whitelist_ip ) {
+			$whitelist_ip = trim( $whitelist_ip );
+			if ( $whitelist_ip == $ip )
+				return true;
+		}
+	}
+
+	$ip = ( $ip ? yourls_sanitize_ip( $ip ) : yourls_get_IP() );
+
+	yourls_do_action( 'check_ip_flood', $ip );
+
+	global $ydb;
+	$table = YOURLS_DB_TABLE_URL;
+
+	$lasttime = $ydb->fetchValue( "SELECT `timestamp` FROM $table WHERE `ip` = :ip ORDER BY `timestamp` DESC LIMIT 1", array('ip' => $ip) );
+	if( $lasttime ) {
+		$now = date( 'U' );
+		$then = date( 'U', strtotime( $lasttime ) );
+		if( ( $now - $then ) <= YOURLS_FLOOD_DELAY_SECONDS ) {
+			// Flood!
+			yourls_do_action( 'ip_flood', $ip, $now - $then );
+			yourls_die( yourls__( 'Too many URLs added too fast. Slow down please.' ), yourls__( 'Too Many Requests' ), 429 );
+		}
+	}
+
+	return true;
+}
+
 ?>