mirror of
https://github.com/lxsang/silk.git
synced 2024-12-30 14:38:21 +01:00
Compare commits
2 Commits
824769dee2
...
387f85c15d
Author | SHA1 | Date | |
---|---|---|---|
|
387f85c15d | ||
|
0fcf2fc2ab |
93
.gitea/workflows/ci.yml
Normal file
93
.gitea/workflows/ci.yml
Normal file
@ -0,0 +1,93 @@
|
||||
name: AntOS pipeline
|
||||
run-name: Building AntOS binaries
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
build-amd64:
|
||||
uses: git.iohub.dev/dany/actions/autotools-cross.yml@master
|
||||
with:
|
||||
platform: amd64
|
||||
build-arm64:
|
||||
uses: git.iohub.dev/dany/actions/autotools-cross.yml@master
|
||||
with:
|
||||
platform: arm64
|
||||
|
||||
build-arm:
|
||||
uses: git.iohub.dev/dany/actions/autotools-cross.yml@master
|
||||
with:
|
||||
platform: arm
|
||||
|
||||
publish-doc-on-tag:
|
||||
runs-on: act-runner
|
||||
if: gitea.event_name == 'push' && contains(gitea.ref, 'refs/tags/')
|
||||
needs:
|
||||
container:
|
||||
image: iohubdev/ci-tools:latest
|
||||
volumes:
|
||||
- /opt/public/antos-release/:/public/
|
||||
steps:
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v4
|
||||
- name: Update submodule
|
||||
run: git submodule update --init
|
||||
- run: mkdir -p build
|
||||
- name: Build and publish doc and SDK
|
||||
run: |
|
||||
make frontend
|
||||
DOCDIR=/public/doc/ make doc
|
||||
SDKDIR=/public/sdk/ make sdk
|
||||
|
||||
publish-package-on-tag:
|
||||
runs-on: act-runner
|
||||
if: gitea.event_name == 'push' && contains(gitea.ref, 'refs/tags/')
|
||||
needs: [build-amd64, build-arm64, build-arm]
|
||||
container:
|
||||
image: catthehacker/ubuntu:act-latest
|
||||
steps:
|
||||
- name: Check out repository code
|
||||
uses: actions/checkout@v4
|
||||
- run: mkdir -p build
|
||||
- name: get build-amd64 artifacts
|
||||
uses: actions/download-artifact@master
|
||||
with:
|
||||
name: build-amd64
|
||||
path: build
|
||||
- name: get build-arm64 artifacts
|
||||
uses: actions/download-artifact@master
|
||||
with:
|
||||
name: build-arm64
|
||||
path: build
|
||||
- name: get build-arm artifacts
|
||||
uses: actions/download-artifact@master
|
||||
with:
|
||||
name: build-arm
|
||||
path: build
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@master
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@master
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@master
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_PAT }}
|
||||
- name: Env
|
||||
run: |
|
||||
printenv
|
||||
docker info
|
||||
ls . -al
|
||||
ls build/ -al
|
||||
- name: Build and push docker image
|
||||
run: |
|
||||
PKG_VERSION="${{ gitea.ref_name }}"
|
||||
DOCKER_TAG=$PKG_VERSION DOCKER_IMAGE=iohubdev/antos make docker
|
||||
- name: Publish packages
|
||||
run: |
|
||||
rm build/*/opt/ -rf
|
||||
files=$(find ./build -type f)
|
||||
PKG_VERSION="${{ gitea.ref_name }}"
|
||||
URL="https://git.iohub.dev/api/packages/dany/generic/antos/$PKG_VERSION"
|
||||
curl --request "DELETE" --header "Authorization: token ${{ secrets.GT_API_PAT }}" $URL/ || true
|
||||
for file in $files; do
|
||||
curl --header "Authorization: token ${{ secrets.GT_API_PAT }}" --upload-file $file $URL/$(basename $file)
|
||||
done
|
98
Jenkinsfile
vendored
98
Jenkinsfile
vendored
@ -1,98 +0,0 @@
|
||||
def build_lib()
|
||||
{
|
||||
sh '''
|
||||
set -e
|
||||
cd $WORKSPACE
|
||||
mkdir -p build/$arch/
|
||||
[ -f Makefile ] && make clean
|
||||
case $arch in
|
||||
amd64|x86_64)
|
||||
HOST=
|
||||
;;
|
||||
aarch64|arm64)
|
||||
HOST=--host=aarch64-linux-gnu
|
||||
;;
|
||||
armv7l|arm)
|
||||
HOST=--host=arm-linux-gnueabihf
|
||||
;;
|
||||
*)
|
||||
echo "Unkown architecture"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
libtoolize
|
||||
aclocal
|
||||
autoconf
|
||||
automake --add-missing
|
||||
./configure $HOST --prefix=/usr
|
||||
DESTDIR=$WORKSPACE/build/$arch make install
|
||||
'''
|
||||
}
|
||||
|
||||
pipeline{
|
||||
agent {
|
||||
docker {
|
||||
image 'xsangle/ci-tools:latest'
|
||||
reuseNode true
|
||||
}
|
||||
}
|
||||
options {
|
||||
// Limit build history with buildDiscarder option:
|
||||
// daysToKeepStr: history is only kept up to this many days.
|
||||
// numToKeepStr: only this many build logs are kept.
|
||||
// artifactDaysToKeepStr: artifacts are only kept up to this many days.
|
||||
// artifactNumToKeepStr: only this many builds have their artifacts kept.
|
||||
buildDiscarder(logRotator(numToKeepStr: "1"))
|
||||
// Enable timestamps in build log console
|
||||
timestamps()
|
||||
// Maximum time to run the whole pipeline before canceling it
|
||||
timeout(time: 1, unit: 'HOURS')
|
||||
// Use Jenkins ANSI Color Plugin for log console
|
||||
ansiColor('xterm')
|
||||
// Limit build concurrency to 1 per branch
|
||||
disableConcurrentBuilds()
|
||||
}
|
||||
stages
|
||||
{
|
||||
stage('Prepare') {
|
||||
steps {
|
||||
sh'''
|
||||
make clean || true
|
||||
rm -rf build/* || true
|
||||
mkdir build || true
|
||||
'''
|
||||
}
|
||||
}
|
||||
stage('Build AMD64') {
|
||||
steps {
|
||||
script{
|
||||
env.arch = "amd64"
|
||||
}
|
||||
build_lib()
|
||||
}
|
||||
}
|
||||
stage('Build ARM64') {
|
||||
steps {
|
||||
script{
|
||||
env.arch = "arm64"
|
||||
}
|
||||
build_lib()
|
||||
}
|
||||
}
|
||||
stage('Build ARM') {
|
||||
steps {
|
||||
script{
|
||||
env.arch = "arm"
|
||||
}
|
||||
build_lib()
|
||||
}
|
||||
}
|
||||
stage("Archive") {
|
||||
steps{
|
||||
script {
|
||||
archiveArtifacts artifacts: 'build/', fingerprint: true, onlyIfSuccessful: true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
# initialise autoconf and set up some basic information about the program we’re packaging
|
||||
AC_INIT([silk], [0.2.0], [xsang.le@gmail.com])
|
||||
AC_INIT([silk], [1.0.0], [xsang.le@gmail.com])
|
||||
|
||||
# We’re going to use automake for this project
|
||||
# [subdir-objects] if needed
|
||||
|
119
modules/ulib.c
119
modules/ulib.c
@ -23,7 +23,6 @@
|
||||
// zip library
|
||||
#include "3rd/zip/zip.h"
|
||||
|
||||
|
||||
#define MAX_PATH_LEN 1024
|
||||
|
||||
/**
|
||||
@ -33,16 +32,19 @@
|
||||
*/
|
||||
static void trim(char *str, const char delim)
|
||||
{
|
||||
if(!str || strlen(str) == 0) return;
|
||||
if (!str || strlen(str) == 0)
|
||||
return;
|
||||
char *p = str;
|
||||
int l = strlen(p);
|
||||
while (l > 0 && p[l - 1] == delim)
|
||||
p[--l] = 0;
|
||||
while(* p && (* p) == delim ) ++p, --l;
|
||||
while (*p && (*p) == delim)
|
||||
++p, --l;
|
||||
memmove(str, p, l + 1);
|
||||
}
|
||||
|
||||
static int l_check_login (lua_State *L) {
|
||||
static int l_check_login(lua_State *L)
|
||||
{
|
||||
#ifdef LINUX
|
||||
const char *username = luaL_checkstring(L, 1);
|
||||
const char *password = luaL_checkstring(L, 2);
|
||||
@ -88,7 +90,8 @@ static int l_check_login (lua_State *L) {
|
||||
{
|
||||
lua_pushboolean(L, 1);
|
||||
return 1;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
lua_pushboolean(L, 0);
|
||||
return 1;
|
||||
@ -108,7 +111,8 @@ static void get_userId(const char* name, uid_t* uid,gid_t* gid )
|
||||
char *endptr;
|
||||
if (name == NULL || *name == '\0')
|
||||
{
|
||||
*uid = -1; *gid=-1;
|
||||
*uid = -1;
|
||||
*gid = -1;
|
||||
return;
|
||||
}
|
||||
u = strtol(name, &endptr, 10);
|
||||
@ -121,7 +125,8 @@ static void get_userId(const char* name, uid_t* uid,gid_t* gid )
|
||||
pwd = getpwnam(name);
|
||||
if (pwd == NULL)
|
||||
{
|
||||
*uid = -1; *gid=-1;
|
||||
*uid = -1;
|
||||
*gid = -1;
|
||||
return;
|
||||
}
|
||||
*uid = pwd->pw_uid;
|
||||
@ -154,7 +159,8 @@ static int l_waitpid(lua_State* L)
|
||||
static int l_kill(lua_State *L)
|
||||
{
|
||||
int pid = luaL_checknumber(L, 1);
|
||||
if(pid == -1) pid = getpid();
|
||||
if (pid == -1)
|
||||
pid = getpid();
|
||||
int status = kill(pid, SIGHUP);
|
||||
lua_pushnumber(L, status);
|
||||
return 1;
|
||||
@ -228,10 +234,12 @@ static int l_getuid(lua_State* L)
|
||||
{
|
||||
/* Retrieve group list */
|
||||
groups = malloc(ngroups * sizeof(gid_t));
|
||||
if (groups == NULL) {
|
||||
if (groups == NULL)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
if (getgrouplist(name, gid, groups, &ngroups) == -1) {
|
||||
if (getgrouplist(name, gid, groups, &ngroups) == -1)
|
||||
{
|
||||
free(groups);
|
||||
return 1;
|
||||
}
|
||||
@ -239,7 +247,8 @@ static int l_getuid(lua_State* L)
|
||||
lua_pushstring(L, "groups");
|
||||
lua_newtable(L);
|
||||
|
||||
for (j = 0; j < ngroups; j++) {
|
||||
for (j = 0; j < ngroups; j++)
|
||||
{
|
||||
gr = getgrgid(groups[j]);
|
||||
if (gr != NULL)
|
||||
{
|
||||
@ -269,7 +278,6 @@ static void timestr(time_t time, char* buf,int len,char* format, int gmt)
|
||||
strftime(buf, len, format, &t);
|
||||
}
|
||||
|
||||
|
||||
static int l_file_stat(lua_State *L, const char *path)
|
||||
{
|
||||
// const char* path = luaL_checkstring(L,-1);
|
||||
@ -426,7 +434,8 @@ static int l_send_file(lua_State* L)
|
||||
else
|
||||
{
|
||||
new = (char *)luaL_checkstring(L, 2);
|
||||
if (unlink(new) < 0 && errno != ENOENT) {
|
||||
if (unlink(new) < 0 && errno != ENOENT)
|
||||
{
|
||||
lua_pushboolean(L, 0);
|
||||
goto end_send_file;
|
||||
}
|
||||
@ -447,13 +456,11 @@ static int l_send_file(lua_State* L)
|
||||
while (
|
||||
sz > 0 &&
|
||||
read != sz &&
|
||||
(
|
||||
((ret = sendfile(tofd, fromfd, &off, sz - read)) >= 0) ||
|
||||
(errno == EAGAIN)
|
||||
)
|
||||
)
|
||||
(((ret = sendfile(tofd, fromfd, &off, sz - read)) >= 0) ||
|
||||
(errno == EAGAIN)))
|
||||
{
|
||||
if(ret < 0) ret = 0;
|
||||
if (ret < 0)
|
||||
ret = 0;
|
||||
read += ret;
|
||||
}
|
||||
if (read != sz)
|
||||
@ -490,7 +497,8 @@ static int l_read_dir(lua_State* L)
|
||||
{
|
||||
// ignore curent directory, parent directory
|
||||
if (strcmp(dir->d_name, ".") == 0 ||
|
||||
strcmp(dir->d_name,"..")==0/*|| *(dir->d_name)=='.'*/) continue;
|
||||
strcmp(dir->d_name, "..") == 0 /*|| *(dir->d_name)=='.'*/)
|
||||
continue;
|
||||
sprintf(buff, "%s/%s", path, dir->d_name);
|
||||
lua_pushnumber(L, id);
|
||||
// lua_pushstring(L,buff);
|
||||
@ -530,6 +538,24 @@ static int l_chown(lua_State* L)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int l_chmod(lua_State *L)
|
||||
{
|
||||
const char *path = luaL_checkstring(L, 1);
|
||||
const char *mode_str = luaL_checkstring(L, 2);
|
||||
int mode = strtol(mode_str, 0, 8);
|
||||
if (chmod(path, mode) < 0)
|
||||
{
|
||||
lua_pushboolean(L, 0);
|
||||
lua_pushstring(L, strerror(errno));
|
||||
}
|
||||
else
|
||||
{
|
||||
lua_pushboolean(L, 1);
|
||||
lua_pushnil(L);
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
|
||||
static int l_mkdir(lua_State *L)
|
||||
{
|
||||
const char *path = luaL_checkstring(L, 1);
|
||||
@ -574,20 +600,26 @@ static int _recursive_delete(const char* path)
|
||||
while ((dir = readdir(d)) != NULL)
|
||||
{
|
||||
// ignore current & parent dir
|
||||
if(strcmp(dir->d_name,".") == 0 || strcmp(dir->d_name,"..")==0) continue;
|
||||
if (strcmp(dir->d_name, ".") == 0 || strcmp(dir->d_name, "..") == 0)
|
||||
continue;
|
||||
// get the file
|
||||
sprintf(buff, "%s/%s", path, dir->d_name);
|
||||
if(_recursive_delete(buff) == -1) return -1;
|
||||
if (_recursive_delete(buff) == -1)
|
||||
return -1;
|
||||
}
|
||||
closedir(d);
|
||||
// remove dir
|
||||
if(rmdir(path) != 0) return -1;
|
||||
} else return -1;
|
||||
if (rmdir(path) != 0)
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
// file remove
|
||||
if(remove(path) != 0) return -1;
|
||||
if (remove(path) != 0)
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -610,7 +642,8 @@ static int l_cmd_open(lua_State* L)
|
||||
|
||||
/* Open the command for reading. */
|
||||
fp = popen(cmd, "r");
|
||||
if (fp == NULL) {
|
||||
if (fp == NULL)
|
||||
{
|
||||
lua_pushnil(L);
|
||||
return 1;
|
||||
}
|
||||
@ -635,9 +668,11 @@ static int l_cmd_read(lua_State* L)
|
||||
return 1;
|
||||
}
|
||||
char buff[1024];
|
||||
if(fgets(buff, sizeof(buff)-1, fd) != NULL) {
|
||||
if (fgets(buff, sizeof(buff) - 1, fd) != NULL)
|
||||
{
|
||||
lua_pushstring(L, buff);
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
lua_pushnil(L);
|
||||
}
|
||||
@ -681,7 +716,8 @@ static int l_unzip(lua_State* L)
|
||||
static int _add_to_zip(struct zip_t *zip, const char *path, const char *root)
|
||||
{
|
||||
int st = is_dir(path);
|
||||
if(st == -1) return -1;
|
||||
if (st == -1)
|
||||
return -1;
|
||||
char p1[MAX_PATH_LEN];
|
||||
char p2[MAX_PATH_LEN];
|
||||
if (st)
|
||||
@ -696,7 +732,8 @@ static int _add_to_zip(struct zip_t * zip, const char* path, const char* root)
|
||||
while ((dir = readdir(d)) != NULL)
|
||||
{
|
||||
// ignore curent directory, parent directory
|
||||
if(strcmp(dir->d_name,".") == 0 || strcmp(dir->d_name,"..")==0) continue;
|
||||
if (strcmp(dir->d_name, ".") == 0 || strcmp(dir->d_name, "..") == 0)
|
||||
continue;
|
||||
// add file to zip
|
||||
snprintf(p1, MAX_PATH_LEN, "%s/%s", path, dir->d_name);
|
||||
snprintf(p2, MAX_PATH_LEN, "%s/%s", root, dir->d_name);
|
||||
@ -712,8 +749,10 @@ static int _add_to_zip(struct zip_t * zip, const char* path, const char* root)
|
||||
{
|
||||
// if it is a file
|
||||
// add it to zip
|
||||
if(zip_entry_open(zip, root) == -1) return -1;
|
||||
if(zip_entry_fwrite(zip, path) == -1) return -1;
|
||||
if (zip_entry_open(zip, root) == -1)
|
||||
return -1;
|
||||
if (zip_entry_fwrite(zip, path) == -1)
|
||||
return -1;
|
||||
zip_entry_close(zip);
|
||||
}
|
||||
return 0;
|
||||
@ -727,9 +766,11 @@ static int l_zip(lua_State* L)
|
||||
// create a zip handler
|
||||
struct zip_t *zip = zip_open(dest, ZIP_DEFAULT_COMPRESSION_LEVEL, 0);
|
||||
|
||||
if(zip == NULL) goto pfalse;
|
||||
if (zip == NULL)
|
||||
goto pfalse;
|
||||
|
||||
if(_add_to_zip(zip,src,"") == -1) goto pfalse;
|
||||
if (_add_to_zip(zip, src, "") == -1)
|
||||
goto pfalse;
|
||||
|
||||
zip_close(zip);
|
||||
|
||||
@ -739,7 +780,8 @@ static int l_zip(lua_State* L)
|
||||
// return false
|
||||
pfalse:
|
||||
// TODO remove if filed is created
|
||||
if(zip) zip_close(zip);
|
||||
if (zip)
|
||||
zip_close(zip);
|
||||
lua_pushboolean(L, 0);
|
||||
return 1;
|
||||
}
|
||||
@ -809,7 +851,8 @@ static int l_gethomedir(lua_State* L)
|
||||
}
|
||||
struct passwd *pw = getpwuid(uid);
|
||||
|
||||
if (pw == NULL) {
|
||||
if (pw == NULL)
|
||||
{
|
||||
lua_pushnil(L);
|
||||
return 1;
|
||||
}
|
||||
@ -841,6 +884,7 @@ static const struct luaL_Reg _lib [] = {
|
||||
{"waitpid", l_waitpid},
|
||||
{"trim", l_trim},
|
||||
{"chown", l_chown},
|
||||
{"chmod", l_chmod},
|
||||
{"delete", l_delete},
|
||||
{"exists", l_exist},
|
||||
{"mkdir", l_mkdir},
|
||||
@ -856,8 +900,7 @@ static const struct luaL_Reg _lib [] = {
|
||||
{"home_dir", l_gethomedir},
|
||||
{"send_file", l_send_file},
|
||||
{"is_dir", l_is_dir},
|
||||
{NULL,NULL}
|
||||
};
|
||||
{NULL, NULL}};
|
||||
|
||||
int luaopen_ulib(lua_State *L)
|
||||
{
|
||||
|
@ -1,5 +1,5 @@
|
||||
sqlite = require("sqlitedb")
|
||||
|
||||
ulib = require("ulib")
|
||||
if sqlite == nil then
|
||||
return 0
|
||||
end
|
||||
@ -8,7 +8,14 @@ require("silk.core.OOP")
|
||||
|
||||
sqlite.getdb = function(name)
|
||||
if name:find("%.db$") then
|
||||
return sqlite.db(name)
|
||||
local db = sqlite.db(name)
|
||||
if db then
|
||||
ret,err = ulib.chmod(name,"0600")
|
||||
if not ret then
|
||||
LOG_WARN("Unable to change mode of database file %s: %s", name, err)
|
||||
end
|
||||
end
|
||||
return db
|
||||
elseif name:find("/") then
|
||||
LOG_ERROR("Invalid database name %s", name)
|
||||
return nil
|
||||
@ -20,7 +27,15 @@ sqlite.getdb = function(name)
|
||||
return nil
|
||||
end
|
||||
end
|
||||
return sqlite.db(__api__.dbpath .. "/" .. name .. ".db")
|
||||
local path = __api__.dbpath .. "/" .. name .. ".db"
|
||||
local db = sqlite.db(path)
|
||||
if db then
|
||||
local ret,err = ulib.chmod(path,"0600")
|
||||
if not ret then
|
||||
LOG_WARN("Unable to change mode of database file %s: %s", path)
|
||||
end
|
||||
end
|
||||
return db
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user