Merge remote-tracking branch 'origin/bugfix-new-branch-from-unapproved-commit' into bugfix-prevent-empty-branch-push

Author: jescalada

src/proxy/processors/constants.ts

@@ -0,0 +1,5 @@
+export const BRANCH_PREFIX = 'refs/heads/';
+export const EMPTY_COMMIT_HASH = '0000000000000000000000000000000000000000';
+export const FLUSH_PACKET = '0000';
+export const PACK_SIGNATURE = 'PACK';
+export const PACKET_SIZE = 4;

src/proxy/processors/push-action/checkUserPushPermission.ts

@@ -7,8 +7,7 @@ const exec = async (req: any, action: Action): Promise<Action> => {
   const user = action.user;
 
   if (!user) {
-    step.log('Action has no user set. This may be due to a fast-forward ref update. Deferring to getMissingData action.');
-    action.addStep(step);
+    console.log('Action has no user set. This may be due to a fast-forward ref update. Deferring to getMissingData action.');
     return action;
   }
 

src/proxy/processors/push-action/getDiff.ts

@@ -1,6 +1,8 @@
 import { Action, Step } from '../../actions';
 import simpleGit from 'simple-git';
 
+import { EMPTY_COMMIT_HASH } from '../constants';
+
 const exec = async (req: any, action: Action): Promise<Action> => {
   const step = new Step('diff');
 
@@ -18,8 +20,8 @@ const exec = async (req: any, action: Action): Promise<Action> => {
       return action;
     }
 
-    if (action.commitFrom === '0000000000000000000000000000000000000000') {
-      if (action.commitData[0].parent !== '0000000000000000000000000000000000000000') {
+    if (action.commitFrom === EMPTY_COMMIT_HASH) {
+      if (action.commitData[0].parent !== EMPTY_COMMIT_HASH) {
         commitFrom = `${action.commitData[action.commitData.length - 1].parent}`;
       }
     } else {

src/proxy/processors/push-action/getMissingData.ts

@@ -1,11 +1,12 @@
 import { Action, Step } from '../../actions';
 import { validateUser } from './checkUserPushPermission';
 import simpleGit from 'simple-git';
+import { EMPTY_COMMIT_HASH } from '../constants';
 
 const isEmptyBranch = async (action: Action) => {
   const git = simpleGit(`${action.proxyGitPath}/${action.repoName}`);
 
-  if (action.commitFrom === '0'.repeat(40)) {
+  if (action.commitFrom === EMPTY_COMMIT_HASH) {
     try {
       const type = await git.raw(['cat-file', '-t', action.commitTo || '']);
       const known = type.trim() === 'commit';
@@ -23,46 +24,47 @@ const isEmptyBranch = async (action: Action) => {
 const exec = async (req: any, action: Action): Promise<Action> => {
   const step = new Step('getMissingData');
 
-  try {
-    if (!action.commitData) {
-      action.commitData = [];
-    }
+  if (action.commitData && action.commitData.length > 0) {
+    console.log('getMissingData', action);
+    return action;
+  }
 
-    if (action.commitData.length === 0) {
-      if (await isEmptyBranch(action)) {
-        step.setError('Push blocked: Empty branch. Please make a commit before pushing a new branch.');
-        action.addStep(step);
-        step.error = true;
-        return action;
-      }
-      console.log(`commitData not found, fetching missing commits from git...`);
-      const path = `${action.proxyGitPath}/${action.repoName}`;
-      const git = simpleGit(path);
-      const log = await git.log({ from: action.commitFrom, to: action.commitTo });
+  if (await isEmptyBranch(action)) {
+    step.setError('Push blocked: Empty branch. Please make a commit before pushing a new branch.');
+    action.addStep(step);
+    step.error = true;
+    return action;
+  }
+  console.log(`commitData not found, fetching missing commits from git...`);
 
-      action.commitData = log.all.toReversed().map((entry, i, array) => {
-        const parent = i === 0 ? action.commitFrom : array[i - 1].hash;
-        const timestamp = Math.floor(new Date(entry.date).getTime() / 1000).toString();
-        return {
-          message: entry.message || '',
-          committer: entry.author_name || '',
-          tree: entry.hash || '',
-          parent: parent || '0'.repeat(40),
-          author: entry.author_name || '',
-          authorEmail: entry.author_email || '',
-          commitTimestamp: timestamp,
-        }
-      });
-      console.log(`Updated commitData:`, { commitData: action.commitData });
+  try {
+    const path = `${action.proxyGitPath}/${action.repoName}`;
+    const git = simpleGit(path);
+    const log = await git.log({ from: action.commitFrom, to: action.commitTo });
 
-      if (action.commitFrom === '0000000000000000000000000000000000000000') {
-        action.commitFrom = action.commitData[action.commitData.length - 1].parent;
+    action.commitData = log.all.toReversed().map((entry, i, array) => {
+      const parent = i === 0 ? action.commitFrom : array[i - 1].hash;
+      const timestamp = Math.floor(new Date(entry.date).getTime() / 1000).toString();
+      return {
+        message: entry.message || '',
+        committer: entry.author_name || '',
+        tree: entry.hash || '',
+        parent: parent || EMPTY_COMMIT_HASH,
+        author: entry.author_name || '',
+        authorEmail: entry.author_email || '',
+        commitTimestamp: timestamp,
       }
-      const user = action.commitData[action.commitData.length - 1].committer;
-      action.user = user;
+    });
+    console.log(`Updated commitData:`, { commitData: action.commitData });
 
-      return await validateUser(user, action, step);
+    if (action.commitFrom === EMPTY_COMMIT_HASH) {
+      action.commitFrom = action.commitData[action.commitData.length - 1].parent;
     }
+
+    const user = action.commitData[action.commitData.length - 1].committer;
+    action.user = user;
+
+    return await validateUser(user, action, step);
   } catch (e: any) {
     step.setError(e.toString('utf-8'));
   } finally {